diff options
| author | Sascha Haeberling <haeberling@google.com> | 2014-02-07 02:30:53 +0100 |
|---|---|---|
| committer | Sascha Häberling <haeberling@google.com> | 2014-02-11 00:46:02 +0000 |
| commit | de30323ee0598ed0e1c8a1ab942c3e16160062d3 (patch) | |
| tree | db10a3bd5403a8b7002f983f98e80c3e04f61540 /AndroidManifest.xml | |
| parent | 7fc3f71edde748f869ea40aa60932102553abf80 (diff) | |
| download | android_packages_apps_Camera2-de30323ee0598ed0e1c8a1ab942c3e16160062d3.tar.gz android_packages_apps_Camera2-de30323ee0598ed0e1c8a1ab942c3e16160062d3.tar.bz2 android_packages_apps_Camera2-de30323ee0598ed0e1c8a1ab942c3e16160062d3.zip | |
New Settings UI and video quality selection logic.
Bug: 12467965
Bug: 12935910
Bug: 12575084
Implements the settings as a proper activity/fragment. Also cleans
up some of the old logic we had for handling and displaying settings.
Also has the new L/M/S logic for video quality.
Change-Id: I412af424b74369cef15c7ead2cb09704875972e3
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5fdec3588..2094689b7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -140,6 +140,13 @@ android:configChanges="keyboardHidden|orientation|screenSize"> </activity> + <activity + android:name="com.android.camera.settings.CameraSettingsActivity" + android:label="@string/settings" + android:theme="@style/Theme.CameraSettings" + android:configChanges="keyboardHidden|orientation|screenSize"> + </activity> + <receiver android:name="com.android.camera.DisableCameraReceiver"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> |