Fix b/6213053 Add Help entry point to Gallery (targeted for J release)

b:6213053

Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365

4 files changed, 27 insertions, 0 deletions

diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index 3bb46f7d1..749b7f961 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -30,4 +30,7 @@
     <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:showAsAction="never" />
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d4bf75972..b0a01eeb3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -433,4 +433,9 @@
     <!-- The label for the folder contains screenshot images. [CHAR LIMIT=20]-->
     <string name="folder_screenshot">Screenshot</string>
 
+    <!-- The title of the menu item which display online help in browser. [CHAR LIMIT=20]-->
+    <string name="help">Help</string>
+
+    <!-- Web address for gallery help.  DO NOT TRANSLATE -->
+    <string name="general_help_link" translatable="false">http://support.google.com/mobile/?p=gallery_top</string>
 </resources>
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 60de019de..c66f538b2 100644
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -477,6 +477,11 @@ public class AlbumSetPage extends ActivityState implements
                 activity.startActivity(new Intent(activity, GallerySettings.class));
                 return true;
             }
+            case R.id.action_general_help: {
+                activity.startActivity(
+                        GalleryUtils.getHelpIntent(R.string.general_help_link, activity));
+                return true;
+            }
             default:
                 return false;
         }
diff --git a/src/com/android/gallery3d/util/GalleryUtils.java b/src/com/android/gallery3d/util/GalleryUtils.java
index fa9c97c75..13e08f9ee 100644
--- a/src/com/android/gallery3d/util/GalleryUtils.java
+++ b/src/com/android/gallery3d/util/GalleryUtils.java
@@ -24,6 +24,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.net.Uri;
 import android.os.ConditionVariable;
 import android.os.Environment;
@@ -330,4 +331,17 @@ public class GalleryUtils {
         int h = item.getHeight();
         return (h > 0 && w / h >= 2);
     }
+
+    public static Intent getHelpIntent(int helpUrlResId, Context context) {
+        Resources res = context.getResources();
+        String url = res.getString(helpUrlResId)
+                + "&hl=" + res.getConfiguration().locale.getLanguage();
+
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
+        return i;
+    }
 }