diff options
author | Chih-Chung Chang <chihchung@google.com> | 2009-09-24 17:44:36 -0700 |
---|---|---|
committer | Chih-Chung Chang <chihchung@google.com> | 2009-09-24 17:45:28 -0700 |
commit | cef4defac47213905f8bc5677dad53fb60c2ee83 (patch) | |
tree | afb84471d2f0e23f1c136c9202841ddb8c664928 | |
parent | c7e5e484f83da0d44b8f1d5639a8bfb2f53db469 (diff) | |
download | LegacyCamera-cef4defac47213905f8bc5677dad53fb60c2ee83.tar.gz LegacyCamera-cef4defac47213905f8bc5677dad53fb60c2ee83.tar.bz2 LegacyCamera-cef4defac47213905f8bc5677dad53fb60c2ee83.zip |
Disable animation for Camera and VideoCamera activities so the switch does not cause animation.
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | res/values/styles.xml | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8e150564..e6216db6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,7 +23,7 @@ </receiver> <activity android:name="Camera" android:configChanges="orientation|keyboardHidden" - android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" + android:theme="@style/CustomTheme" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" android:taskAffinity="android.task.camera"> @@ -45,7 +45,7 @@ android:label="@string/video_camera_label" android:configChanges="orientation|keyboardHidden" android:icon="@drawable/ic_launcher_video_camera" - android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" + android:theme="@style/CustomTheme" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" android:taskAffinity="android.task.camcorder"> diff --git a/res/values/styles.xml b/res/values/styles.xml index 3a2f26ca..c6de7f70 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -70,8 +70,16 @@ <item name="android:orientation">vertical</item> <item name="android:gravity">top|center_horizontal</item> <item name="android:layout_height">wrap_content</item> - <item name="android:layout_width">fill_parent</item>> + <item name="android:layout_width">fill_parent</item> </style> <style name="Theme.DeleteImageDialog" parent="android:style/Theme.Dialog.Alert"> </style> + <style name="NoEnterExitAnimation"> + <item name="android:windowEnterAnimation">@null</item> + <item name="android:windowExitAnimation">@null</item> + </style> + <style name="CustomTheme" + parent="@android:style/Theme.Black.NoTitleBar.Fullscreen"> + <item name="android:windowAnimationStyle">@style/NoEnterExitAnimation</item> + </style> </resources> |