Gallery : Filter picasa specific options
Remove menu options that don't serve a purpose due to their dependency
on picasa support being built in.
Also add in the help url to stay in sync with GalleryGoogle.
https://jira.cyanogenmod.org/browse/CYAN-1329
Change-Id: Ie75b839ec9b30a5a934477e92523803239a238e3
Conflicts:
res/menu/albumset.xml
src/com/android/gallery3d/app/AlbumSetPage.java
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 8ac8cbb..44258ed 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -21,15 +21,28 @@
<item android:id="@+id/action_select"
android:title="@string/select_album"
android:showAsAction="never" />
+
+<!-- These items do not serve a purpose due to the lack of built in
+ picasa support.
+ Also comment out the settings case at AlbumSetPage.onItemSelected method.
+
<item android:id="@+id/action_manage_offline"
android:title="@string/make_available_offline"
android:showAsAction="never" />
<item android:id="@+id/action_sync_picasa_albums"
android:title="@string/sync_picasa_albums"
android:showAsAction="never" />
+-->
+
+<!-- Comment out to enable Settings in menu. This should be done when
+ GallerySettings.java has content, as it is currently empty.
+ Also comment out the settings case at AlbumSetPage.onItemSelected method.
+
<item android:id="@+id/action_settings"
android:title="@string/settings"
android:showAsAction="never" />
+-->
+
<item android:id="@+id/action_general_help"
android:title="@string/help"
android:visible="false"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3035fec..d23ce6b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -493,7 +493,7 @@
<string name="help">Help</string>
<!-- Web address for gallery help. DO NOT TRANSLATE -->
- <string name="help_url_gallery_main" translatable="false"></string>
+ <string name="help_url_gallery_main" translatable="false">http://support.google.com/mobile/?p=gallery_main</string>
<!-- The tilte of a dialog showing there is no external storage. [CHAR LIMIT=20] -->
<string name="no_external_storage_title">No Storage</string>
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index fc76e1c..e779339 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -604,6 +604,9 @@
GalleryUtils.startCameraActivity(activity);
return true;
}
+/* Comment out since picasa support is not built in.
+ Also comment out the settings item at albumset.xml menu.
+
case R.id.action_manage_offline: {
Bundle data = new Bundle();
String mediaPath = mActivity.getDataManager().getTopSetPath(
@@ -616,10 +619,16 @@
PicasaSource.requestSync(activity);
return true;
}
+*/
+/* Comment out to enable Settings in menu. This should be done when
+ GallerySettings.java has content, as it is currently empty.
+ Also comment out the settings item at albumset.xml menu.
+
case R.id.action_settings: {
activity.startActivity(new Intent(activity, GallerySettings.class));
return true;
}
+*/
default:
return false;
}