diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-07-22 10:52:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-22 10:52:34 -0700 |
| commit | 8cbe6e9cef46adc14b6c3e0f3ea303b78232a8b9 (patch) | |
| tree | 52feaff608421021c7ae2fb6939049130829efd8 | |
| parent | 423f0ed494d30bbae1a02c059769f0211f1e4d81 (diff) | |
| parent | 91c9ac05efd7425565b5c8f0f3f8b7b9658ce143 (diff) | |
| download | frameworks_base-8cbe6e9cef46adc14b6c3e0f3ea303b78232a8b9.zip frameworks_base-8cbe6e9cef46adc14b6c3e0f3ea303b78232a8b9.tar.gz frameworks_base-8cbe6e9cef46adc14b6c3e0f3ea303b78232a8b9.tar.bz2 | |
Merge "Fix issue #5050039: Launcher is sometimes rendering..."
| -rw-r--r-- | core/res/res/anim/screen_rotate_minus_90_enter.xml | 5 | ||||
| -rw-r--r-- | core/res/res/anim/screen_rotate_plus_90_enter.xml | 5 | ||||
| -rw-r--r-- | services/java/com/android/server/wm/BlackFrame.java | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/core/res/res/anim/screen_rotate_minus_90_enter.xml b/core/res/res/anim/screen_rotate_minus_90_enter.xml index 30518e0..61aa72a 100644 --- a/core/res/res/anim/screen_rotate_minus_90_enter.xml +++ b/core/res/res/anim/screen_rotate_minus_90_enter.xml @@ -19,11 +19,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:fromXScale="100%p" android:toXScale="100%" - android:fromYScale="100%p" android:toYScale="100%" - android:pivotX="50%" android:pivotY="50%" - android:interpolator="@interpolator/decelerate_quint" - android:duration="@android:integer/config_mediumAnimTime" /> <rotate android:fromDegrees="-90" android:toDegrees="0" android:pivotX="50%" android:pivotY="50%" android:interpolator="@interpolator/decelerate_quint" diff --git a/core/res/res/anim/screen_rotate_plus_90_enter.xml b/core/res/res/anim/screen_rotate_plus_90_enter.xml index 20943c8..53b0ccd 100644 --- a/core/res/res/anim/screen_rotate_plus_90_enter.xml +++ b/core/res/res/anim/screen_rotate_plus_90_enter.xml @@ -19,11 +19,6 @@ <set xmlns:android="http://schemas.android.com/apk/res/android" android:shareInterpolator="false"> - <scale android:fromXScale="100%p" android:toXScale="100%" - android:fromYScale="100%p" android:toYScale="100%" - android:pivotX="50%" android:pivotY="50%" - android:interpolator="@interpolator/decelerate_quint" - android:duration="@android:integer/config_mediumAnimTime" /> <rotate android:fromDegrees="90" android:toDegrees="0" android:pivotX="50%" android:pivotY="50%" android:interpolator="@interpolator/decelerate_quint" diff --git a/services/java/com/android/server/wm/BlackFrame.java b/services/java/com/android/server/wm/BlackFrame.java index d8fd7fe..36f5dcb 100644 --- a/services/java/com/android/server/wm/BlackFrame.java +++ b/services/java/com/android/server/wm/BlackFrame.java @@ -32,10 +32,12 @@ public class BlackFrame { final int top; final Surface surface; - BlackSurface(SurfaceSession session, int layer, int l, int t, int w, int h) + BlackSurface(SurfaceSession session, int layer, int l, int t, int r, int b) throws Surface.OutOfResourcesException { left = l; top = t; + int w = r-l; + int h = b-t; surface = new Surface(session, 0, "BlackSurface", -1, w, h, PixelFormat.OPAQUE, Surface.FX_SURFACE_DIM); if (WindowManagerService.SHOW_TRANSACTIONS || |