Camera: Add CameraGestureActivity as alias of CameraActivity

Make the activity could show above lock screen and turn on screen
when it is started by gesture operation.

Change-Id: I2099154f2325de83597b4262203c58a84b91f2d9

4 files changed, 21 insertions, 0 deletions

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b92f8e798..bf13fac83 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,6 +93,18 @@
             </intent-filter>
         </activity-alias>
 
+        <activity-alias
+            android:name="com.android.camera.CameraGestureActivity"
+            android:icon="@mipmap/ic_launcher_camera"
+            android:label="@string/camera_gesture_title"
+            android:targetActivity="com.android.camera.CameraActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
         <!-- Video camera and capture use the Camcorder label and icon. -->
         <activity-alias
             android:name="com.android.camera.VideoCamera"
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fafdef192..eaff85e48 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -520,4 +520,7 @@
 
     <!-- toast about switch storage -->
     <string name="on_switch_save_path_to_sdcard">内部存储空间不足，已切换存储到SD卡</string>
+
+    <!-- The alas of CameraActivity for gesture operation -->
+    <string name="camera_gesture_title">打开相机</string>
 </resources>
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index a3cb048ba..8b361f9b0 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -861,5 +861,7 @@
     <string name="advance_feature_enable_msg">
             Continuous shot is not supported when advance features are enabled</string>
 
+    <!-- The alas of CameraActivity for gesture operation -->
+    <string name="camera_gesture_title">Launch camera</string>
 </resources>
 
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b5fc0a676..4bcb84428 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1156,6 +1156,10 @@ public class CameraActivity extends Activity
 
         getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
         setContentView(R.layout.camera_filmstrip);
+        int flags = WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON;
+        getWindow().addFlags(flags);
+
         mActionBar = getActionBar();
         mActionBar.addOnMenuVisibilityListener(this);