Merge "Allow user to tap on lock icon from secure camera." into gb-ub-photos-carlsbad

2 files changed, 25 insertions, 4 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 702de876d..b18f4e993 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -795,10 +795,7 @@ public class CameraActivity extends Activity
         switch (item.getItemId()) {
             case android.R.id.home:
                 // ActionBar's Up/Home button was clicked
-                if (ApiHelper.HAS_APP_GALLERY) {
-                    startActivity(Intent.makeMainSelectorActivity(
-                                Intent.ACTION_MAIN, Intent.CATEGORY_APP_GALLERY));
-                } else {
+                if (!CameraUtil.launchGallery(CameraActivity.this)) {
                     mFilmStripView.getController().goToFirstItem();
                 }
                 return true;
@@ -986,6 +983,13 @@ public class CameraActivity extends Activity
             // 0.
             ImageView v = (ImageView) getLayoutInflater().inflate(
                     R.layout.secure_album_placeholder, null);
+            v.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    CameraUtil.launchGallery(CameraActivity.this);
+                    finish();
+                }
+            });
             mDataAdapter = new FixedLastDataAdapter(
                     mWrappedDataAdapter,
                     new SimpleViewData(
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 3ce19b561..7c1a415da 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -899,4 +899,21 @@ public class CameraUtil {
         }
         return ret;
     }
+
+    /**
+     * Launches apps supporting action {@link Intent.ACTION_MAIN} of category
+     * {@link Intent.CATEGORY_APP_GALLERY}. Note that
+     * {@link Intent.CATEGORY_APP_GALLERY} is only available on API level 15+.
+     *
+     * @param ctx The {@link android.content.Context} to launch the app.
+     * @return {@code true} on success.
+     */
+    public static boolean launchGallery(Context ctx) {
+        if (ApiHelper.HAS_APP_GALLERY) {
+            ctx.startActivity(Intent.makeMainSelectorActivity(
+                    Intent.ACTION_MAIN, Intent.CATEGORY_APP_GALLERY));
+            return true;
+        }
+        return false;
+    }
 }