diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-26 00:44:29 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-03-26 12:52:53 -0700 |
| commit | d49258fed489bcd72a2b2a6ce3a3c38d4b2531e6 (patch) | |
| tree | fdb02af6a4750fa8795a57f9aaec67660cffedba /core/java/android | |
| parent | fc6d1ba930111ef7a51d91908f489ca9469fc572 (diff) | |
Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83
There was a really dumb bug that was causing us to not always apply
the new configuration. As a result of fixing this, there were new
glithes in the transition between car and regular mode, so further
work here to fix that. And since I was actually working during the
night and seeing night mode, I noticed how obnoxiously bright the
status bar is compared to the car home at night, so it now nicely
dims itself when we switch to the night config. Oh and in doing
that I also found and fixed a bug in dispatching config changes to
a window (where they wouldn't get dispatched if the window didn't
resize).
FINALLY... tweak the wallpaper enter/exit animations a bit to
make them a little smoother.
Change-Id: I4e062093cbcfbc919307799a794846db2920216f
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/IUiModeManager.aidl | 2 | ||||
| -rw-r--r-- | core/java/android/app/UiModeManager.java | 14 | ||||
| -rw-r--r-- | core/java/android/view/ViewRoot.java | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/core/java/android/app/IUiModeManager.aidl b/core/java/android/app/IUiModeManager.aidl index bd637b7ac801..7b668d2f21d2 100644 --- a/core/java/android/app/IUiModeManager.aidl +++ b/core/java/android/app/IUiModeManager.aidl @@ -30,7 +30,7 @@ interface IUiModeManager { /** * Disables the car mode. */ - void disableCarMode(); + void disableCarMode(int flags); /** * Return the current running mode. diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 82da98348d11..0007f5856276 100644 --- a/core/java/android/app/UiModeManager.java +++ b/core/java/android/app/UiModeManager.java @@ -116,12 +116,22 @@ public class UiModeManager { } /** + * Flag for use with {@link #disableCarMode(int)}: go to the normal + * home activity as part of the disable. Disabling this way ensures + * a clean transition between the current activity (in car mode) and + * the original home activity (which was typically last running without + * being in car mode). + */ + public static final int DISABLE_CAR_MODE_GO_HOME = 0x0001; + + /** * Turn off special mode if currently in car mode. + * @param flags May be 0 or {@link #DISABLE_CAR_MODE_GO_HOME}. */ - public void disableCarMode() { + public void disableCarMode(int flags) { if (mService != null) { try { - mService.disableCarMode(); + mService.disableCarMode(flags); } catch (RemoteException e) { Log.e(TAG, "disableCarMode: RemoteException", e); } diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java index 74943f3b6319..ed83bca73933 100644 --- a/core/java/android/view/ViewRoot.java +++ b/core/java/android/view/ViewRoot.java @@ -1855,7 +1855,8 @@ public final class ViewRoot extends Handler implements ViewParent, if (mWinFrame.width() == msg.arg1 && mWinFrame.height() == msg.arg2 && mPendingContentInsets.equals(ri.coveredInsets) - && mPendingVisibleInsets.equals(ri.visibleInsets)) { + && mPendingVisibleInsets.equals(ri.visibleInsets) + && ((ResizedInfo)msg.obj).newConfig == null) { break; } // fall through... |
