summaryrefslogtreecommitdiffstats
path: root/src/com/android/dreams/phototable/PhotoTableDreamSettings.java
diff options
context:
space:
mode:
authorChris Wren <cwren@android.com>2013-03-27 17:13:12 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-27 17:13:12 -0700
commit1552cabf31434dbaa67b4b7925e41b0ff82d328e (patch)
treee0fe63b4d0124953a697520442cef8bcbc503422 /src/com/android/dreams/phototable/PhotoTableDreamSettings.java
parent0fba234a706e1be289e79545d93ee066f4826614 (diff)
parent998de5ac11e9b8e9b32097f35b9de89cc02ce814 (diff)
downloadandroid_packages_screensavers_PhotoTable-1552cabf31434dbaa67b4b7925e41b0ff82d328e.tar.gz
android_packages_screensavers_PhotoTable-1552cabf31434dbaa67b4b7925e41b0ff82d328e.tar.bz2
android_packages_screensavers_PhotoTable-1552cabf31434dbaa67b4b7925e41b0ff82d328e.zip
am 998de5ac: am 2ccf92a7: Add \'select all\' to photo dream settings.
* commit '998de5ac11e9b8e9b32097f35b9de89cc02ce814': Add 'select all' to photo dream settings.
Diffstat (limited to 'src/com/android/dreams/phototable/PhotoTableDreamSettings.java')
-rw-r--r--src/com/android/dreams/phototable/PhotoTableDreamSettings.java30
1 files changed, 5 insertions, 25 deletions
diff --git a/src/com/android/dreams/phototable/PhotoTableDreamSettings.java b/src/com/android/dreams/phototable/PhotoTableDreamSettings.java
index 6f7e9f1..a42d4a6 100644
--- a/src/com/android/dreams/phototable/PhotoTableDreamSettings.java
+++ b/src/com/android/dreams/phototable/PhotoTableDreamSettings.java
@@ -19,6 +19,9 @@ import android.content.SharedPreferences;
import android.app.ListActivity;
import android.os.AsyncTask;
import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import android.widget.ListAdapter;
import java.util.LinkedList;
@@ -26,37 +29,14 @@ import java.util.LinkedList;
/**
* Settings panel for photo flipping dream.
*/
-public class PhotoTableDreamSettings extends ListActivity {
+public class PhotoTableDreamSettings extends FlipperDreamSettings {
private static final String TAG = "PhotoTableDreamSettings";
public static final String PREFS_NAME = PhotoTableDream.TAG;
- private PhotoSourcePlexor mPhotoSource;
- private ListAdapter mAdapter;
- private SharedPreferences mSettings;
-
@Override
protected void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState);
-
mSettings = getSharedPreferences(PREFS_NAME, 0);
- mPhotoSource = new PhotoSourcePlexor(this, mSettings);
- setContentView(R.layout.settingslist);
-
- new AsyncTask<Void, Void, Void>() {
- @Override
- public Void doInBackground(Void... unused) {
- mAdapter = new SectionedAlbumDataAdapter(PhotoTableDreamSettings.this,
- mSettings,
- R.layout.header,
- R.layout.album,
- new LinkedList<PhotoSource.AlbumData>(mPhotoSource.findAlbums()));
- return null;
- }
-
- @Override
- public void onPostExecute(Void unused) {
- setListAdapter(mAdapter);
- }
- }.execute();
+ init();
}
}