summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-10-30 10:09:20 +0800
committercretin45 <cretin45@gmail.com>2014-12-15 14:49:44 -0800
commit21a80743d420fe04c1d24ff9e36f05224bacc8d5 (patch)
treebac954d01a81ececbc771f6f060e1d3086a11458
parent19054ff75a4d3533f5f9f6cb4d0c2112382c47c3 (diff)
downloadandroid_packages_apps_Gallery2-21a80743d420fe04c1d24ff9e36f05224bacc8d5.tar.gz
android_packages_apps_Gallery2-21a80743d420fe04c1d24ff9e36f05224bacc8d5.tar.bz2
android_packages_apps_Gallery2-21a80743d420fe04c1d24ff9e36f05224bacc8d5.zip
Gallery2: The settings in the gallery is blank.
The settings' activity is blank. The settings is added by Google, maybe there is some functions later. So just take is as annotation. Change-Id: I2c738def95b2ce08c679f83d9d8e26130b503ada CRs-Fixed: 745988
-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 625b9b737..7d2f67624 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 a088e8b6c..1dca84068 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;
}