diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2015-01-09 06:48:42 +0200 |
|---|---|---|
| committer | Michael Bestas <mikeioannina@gmail.com> | 2015-01-09 07:04:31 +0200 |
| commit | 960dd9c3bf9f6bcffc20ca7796fe1765027a229f (patch) | |
| tree | 19ebda406909e8f85e77dfc3b3809748f3b09f9f | |
| parent | 5b3edb5c1295ae54d644ffc08e03c92759321026 (diff) | |
| download | android_packages_apps_Gallery2-960dd9c3bf9f6bcffc20ca7796fe1765027a229f.tar.gz android_packages_apps_Gallery2-960dd9c3bf9f6bcffc20ca7796fe1765027a229f.tar.bz2 android_packages_apps_Gallery2-960dd9c3bf9f6bcffc20ca7796fe1765027a229f.zip | |
Revert "Gallery2: The settings in the gallery is blank."
This reverts commit 21a80743d420fe04c1d24ff9e36f05224bacc8d5.
Change-Id: I9417af7e6c51384f289dc1e90f6794133bac5fb7
| -rw-r--r-- | res/menu/albumset.xml | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/AlbumSetPage.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index 7d2f67624..625b9b737 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -30,9 +30,9 @@ <item android:id="@+id/action_sync_picasa_albums" android:title="@string/sync_picasa_albums" android:showAsAction="never" /> - <!-- <item android:id="@+id/action_settings" + <item android:id="@+id/action_settings" android:title="@string/settings" - android:showAsAction="never" /> --> + android:showAsAction="never" /> <item android:id="@+id/action_general_help" android:title="@string/help" android:visible="false" diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java index 929205a4e..68cbb4c99 100644 --- a/src/com/android/gallery3d/app/AlbumSetPage.java +++ b/src/com/android/gallery3d/app/AlbumSetPage.java @@ -628,10 +628,10 @@ public class AlbumSetPage extends ActivityState implements PicasaSource.requestSync(activity); return true; } - /*case R.id.action_settings: { + case R.id.action_settings: { activity.startActivity(new Intent(activity, GallerySettings.class)); return true; - }*/ + } default: return false; } |