summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mikeioannina@gmail.com>2015-01-09 06:48:42 +0200
committerSteve Kondik <steve@cyngn.com>2015-03-28 14:58:54 -0700
commitdbdec5a71c45fe8fbde33a20b9f400cc2f10e277 (patch)
tree369e077efe4a1b582b44280bac434bb03ea31192
parent8794f082831f1dc7d2b2cee4980c585d409c3e67 (diff)
downloadandroid_packages_apps_Gallery2-dbdec5a71c45fe8fbde33a20b9f400cc2f10e277.zip
android_packages_apps_Gallery2-dbdec5a71c45fe8fbde33a20b9f400cc2f10e277.tar.gz
android_packages_apps_Gallery2-dbdec5a71c45fe8fbde33a20b9f400cc2f10e277.tar.bz2
Revert "Gallery2: The settings in the gallery is blank."
This reverts commit 21a80743d420fe04c1d24ff9e36f05224bacc8d5. Change-Id: I9417af7e6c51384f289dc1e90f6794133bac5fb7
-rw-r--r--res/menu/albumset.xml4
-rw-r--r--src/com/android/gallery3d/app/AlbumSetPage.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 182e83c..464e2f6 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -31,9 +31,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 2884727..5e10049 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -707,10 +707,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;
}