Rename ThemeCamera to Theme.Camera to be consistent.

bug:6982707
Change-Id: Ic82f542ee8aafdf6c49344887459e75303ca5df8

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e87bae..2ad38c4 100644 (file)
--- 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"
         <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"
                 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"
         <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"
                 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"
         <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">
                 android:configChanges="orientation|screenSize|keyboardHidden"
                 android:clearTaskOnLaunch="true"
                 android:windowSoftInputMode="stateAlwaysHidden|adjustPan">