From dbdec5a71c45fe8fbde33a20b9f400cc2f10e277 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Fri, 9 Jan 2015 06:48:42 +0200
Subject: Revert "Gallery2: The settings in the gallery is blank."

This reverts commit 21a80743d420fe04c1d24ff9e36f05224bacc8d5.

Change-Id: I9417af7e6c51384f289dc1e90f6794133bac5fb7
---
 res/menu/albumset.xml                           | 4 ++--
 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 182e83cd4..464e2f6b9 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 288472793..5e100498c 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;
         }
-- 
cgit v1.2.3