summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-08-14 16:21:00 +0800
committerWu-cheng Li <wuchengli@google.com>2012-08-14 16:21:00 +0800
commitceb25e968ae6c7360de52c477816995ee3edc340 (patch)
tree9eb279d3ea1528389461d730d5baf61c76ad4c52 /AndroidManifest.xml
parentcac6ef162e2cd25df1bbd03c4930fd8110b31724 (diff)
downloadandroid_packages_apps_Gallery2-ceb25e968ae6c7360de52c477816995ee3edc340.tar.gz
android_packages_apps_Gallery2-ceb25e968ae6c7360de52c477816995ee3edc340.tar.bz2
android_packages_apps_Gallery2-ceb25e968ae6c7360de52c477816995ee3edc340.zip
Rename ThemeCamera to Theme.Camera to be consistent.
bug:6982707 Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml6
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">