diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-01-18 12:10:36 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-18 12:10:36 -0800 |
commit | 2e1469a13d6cca6c9cb3a48151c15f0ca73fa003 (patch) | |
tree | c37deecf6d72a2e2b6fef1495e6784eaa36e329f /policy | |
parent | a999802d0c600297695670e00d2cd33fc6007706 (diff) | |
parent | f67591025debf040695e9ed0d0edeff5ef0c5db2 (diff) | |
download | frameworks_base-2e1469a13d6cca6c9cb3a48151c15f0ca73fa003.zip frameworks_base-2e1469a13d6cca6c9cb3a48151c15f0ca73fa003.tar.gz frameworks_base-2e1469a13d6cca6c9cb3a48151c15f0ca73fa003.tar.bz2 |
am f6759102: am 3aa959b9: Merge "Fix issue #3362666 Activities launched from ongoing notifications don\'t animate" into honeycomb
* commit 'f67591025debf040695e9ed0d0edeff5ef0c5db2':
Fix issue #3362666 Activities launched from ongoing notifications don't animate
Diffstat (limited to 'policy')
-rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 6b559cf..747242f 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -1965,23 +1965,29 @@ public class PhoneWindowManager implements WindowManagerPolicy { // behind it. return false; } - if (mStatusBar != null && mStatusBar.isVisibleLw()) { - Rect rect = new Rect(mStatusBar.getShownFrameLw()); - for (int i=mStatusBarPanels.size()-1; i>=0; i--) { - WindowState w = mStatusBarPanels.get(i); - if (w.isVisibleLw()) { - rect.union(w.getShownFrameLw()); + if (false) { + // Don't do this on the tablet, since the system bar never completely + // covers the screen, and with all its transparency this will + // incorrectly think it does cover it when it doesn't. We'll revisit + // this later when we re-do the phone status bar. + if (mStatusBar != null && mStatusBar.isVisibleLw()) { + Rect rect = new Rect(mStatusBar.getShownFrameLw()); + for (int i=mStatusBarPanels.size()-1; i>=0; i--) { + WindowState w = mStatusBarPanels.get(i); + if (w.isVisibleLw()) { + rect.union(w.getShownFrameLw()); + } + } + final int insetw = mRestrictedScreenWidth/10; + final int inseth = mRestrictedScreenHeight/10; + if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw, + mRestrictedScreenHeight-inseth)) { + // All of the status bar windows put together cover the + // screen, so the app can't be seen. (Note this test doesn't + // work if the rects of these windows are at off offsets or + // sizes, causing gaps in the rect union we have computed.) + return false; } - } - final int insetw = mRestrictedScreenWidth/10; - final int inseth = mRestrictedScreenHeight/10; - if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw, - mRestrictedScreenHeight-inseth)) { - // All of the status bar windows put together cover the - // screen, so the app can't be seen. (Note this test doesn't - // work if the rects of these windows are at off offsets or - // sizes, causing gaps in the rect union we have computed.) - return false; } } return true; |