diff options
author | Wu-cheng Li <wuchengli@google.com> | 2012-08-14 16:21:00 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2012-08-14 16:21:00 +0800 |
commit | c66753055d3a74e80a5cce0fe608d930ad14072f (patch) | |
tree | 594024ba47b6c786f24a51c88efd0de11b828128 | |
parent | b69655f5c12b599d5e9282dde56f82265e94a174 (diff) | |
download | android_packages_apps_Camera2-c66753055d3a74e80a5cce0fe608d930ad14072f.tar.gz android_packages_apps_Camera2-c66753055d3a74e80a5cce0fe608d930ad14072f.tar.bz2 android_packages_apps_Camera2-c66753055d3a74e80a5cce0fe608d930ad14072f.zip |
Rename ThemeCamera to Theme.Camera to be consistent.
bug:6982707
Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8
-rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2e87baee0..2ad38c4ce 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -257,7 +257,7 @@ <activity android:name="com.android.camera.Camera" android:taskAffinity="com.android.camera" android:label="@string/camera_label" - android:theme="@style/ThemeCamera" + android:theme="@style/Theme.Camera" android:icon="@mipmap/ic_launcher_camera" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" @@ -286,7 +286,7 @@ <activity android:name="com.android.camera.VideoCamera" android:taskAffinity="com.android.camera" android:label="@string/video_camera_label" - android:theme="@style/ThemeCamera" + android:theme="@style/Theme.Camera" android:configChanges="orientation|screenSize|keyboardHidden" android:icon="@mipmap/ic_launcher_video_camera" android:clearTaskOnLaunch="true" @@ -303,7 +303,7 @@ <activity android:name="com.android.camera.PanoramaActivity" android:taskAffinity="com.android.camera" android:label="@string/pano_dialog_title" - android:theme="@style/ThemeCamera" + android:theme="@style/Theme.Camera" android:configChanges="orientation|screenSize|keyboardHidden" android:clearTaskOnLaunch="true" android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> |