diff options
| author | Wei-Ta Chen <weita@google.com> | 2010-02-24 11:34:22 +0800 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2010-02-24 13:56:57 +0800 |
| commit | b6be8b6567cc7d758ce58bc8ba1b05e1e9debfae (patch) | |
| tree | 11ccd133c62ce0baa48cab9241636d933cf05592 | |
| parent | 17110a78c70e7f6112df64955023ccabc800439d (diff) | |
| download | packages_apps_LegacyCamera-b6be8b6567cc7d758ce58bc8ba1b05e1e9debfae.zip packages_apps_LegacyCamera-b6be8b6567cc7d758ce58bc8ba1b05e1e9debfae.tar.gz packages_apps_LegacyCamera-b6be8b6567cc7d758ce58bc8ba1b05e1e9debfae.tar.bz2 | |
Enable enter and exit animations; and use overridePendingTransition
for disabling animations in switching VideoCamera and Camera.
Bug: 2416396
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/MenuHelper.java | 3 |
3 files changed, 5 insertions, 10 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9353304..87c4217 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,7 +26,7 @@ </receiver> <activity android:name="Camera" android:configChanges="orientation|keyboardHidden" - android:theme="@style/CustomTheme" + android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" android:taskAffinity="android.task.camera"> @@ -48,7 +48,7 @@ android:label="@string/video_camera_label" android:configChanges="orientation|keyboardHidden" android:icon="@drawable/ic_launcher_video_camera" - android:theme="@style/CustomTheme" + android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" android:screenOrientation="landscape" android:clearTaskOnLaunch="true" android:taskAffinity="android.task.camcorder"> diff --git a/res/values/styles.xml b/res/values/styles.xml index fa1c690..67e59a0 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -57,20 +57,12 @@ <item name="android:layout_height">wrap_content</item> <item name="android:layout_width">match_parent</item> </style> - <style name="NoEnterExitAnimation"> - <item name="android:windowEnterAnimation">@null</item> - <item name="android:windowExitAnimation">@null</item> - </style> <style name="IconIndicator"> <item name="android:layout_marginTop">10dp</item> <item name="android:layout_marginBottom">10dp</item> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> </style> - <style name="CustomTheme" - parent="@android:style/Theme.Black.NoTitleBar.Fullscreen"> - <item name="android:windowAnimationStyle">@style/NoEnterExitAnimation</item> - </style> <style name="Animation_OnScreenMenu"> <item name="android:windowEnterAnimation">@anim/on_screen_menu_appear</item> <item name="android:windowExitAnimation">@anim/on_screen_menu_disappear</item> diff --git a/src/com/android/camera/MenuHelper.java b/src/com/android/camera/MenuHelper.java index e2d6d78..4cdc912 100644 --- a/src/com/android/camera/MenuHelper.java +++ b/src/com/android/camera/MenuHelper.java @@ -101,6 +101,8 @@ public class MenuHelper { */ public static final int RESULT_COMMON_MENU_CROP = 490; + private static final int NO_ANIMATION = 0; + public interface MenuItemsResult { public void gettingReadyToOpen(Menu menu, IImage image); public void aboutToCall(MenuItem item, IImage image); @@ -918,6 +920,7 @@ public class MenuHelper { CameraHolder.instance().keep(); activity.startActivity(intent); + activity.overridePendingTransition(NO_ANIMATION, NO_ANIMATION); } public static void gotoVideoMode(Activity activity) { |