diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-16 01:42:19 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-16 01:42:19 -0800 |
| commit | 9199f3752b05ea47157d58b48a278c6288fe2d5c (patch) | |
| tree | 8cc36ec22ce98a783d882656412514538c6dc409 | |
| parent | b8a211285617dbecc49cf391db9219d82f38bdfd (diff) | |
| parent | dfbca43b618cf5b5849d7ec9909177ef62c602a0 (diff) | |
| download | android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.tar.gz android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.tar.bz2 android_packages_apps_Snap-9199f3752b05ea47157d58b48a278c6288fe2d5c.zip | |
Merge "Camera: Add CameraGestureActivity as alias of CameraActivity"
| -rw-r--r-- | AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 3 | ||||
| -rw-r--r-- | res/values/qcomstrings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 4 |
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 4ff56c7c5..e1a8f7985 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -524,4 +524,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 faf21e681..77a905ae3 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -863,5 +863,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 3c4a93a18..b85a7de06 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1158,6 +1158,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); |