Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cupcake'

Browse Source
This commit is contained in:
The Android Open Source Project
2009-01-22 00:16:10 -08:00
parent 572612e1c0 f7bff51294
commit 7ac5a08548
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -950,7 +950,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
pf.bottom = df.bottom = vf.bottom = displayHeight;
mStatusBar.computeFrameLw(pf, df, vf, vf);
mDockTop = mContentTop = mCurTop = mStatusBar.getFrameLw().bottom;
if (mStatusBar.isDisplayedLw()) {
// If the status bar is hidden, we don't want to cause
// windows behind it to scroll.
mDockTop = mContentTop = mCurTop = mStatusBar.getFrameLw().bottom;
}
}
}
@@ -1154,7 +1158,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
&& attrs.type >= FIRST_APPLICATION_WINDOW
&& attrs.type <= LAST_APPLICATION_WINDOW
&& win.fillsScreenLw(mW, mH, true)
&& win.isDisplayedLw()) {
&& win.isVisibleLw()) {
mTopFullscreenOpaqueWindowState = win;
} else if ((attrs.flags & FLAG_FORCE_NOT_FULLSCREEN) != 0) {
mForceStatusBar = true;
@@ -1165,16 +1169,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public boolean finishAnimationLw() {
if (mStatusBar != null) {
if (mForceStatusBar) {
mStatusBar.showLw();
mStatusBar.showLw(true);
} else if (mTopFullscreenOpaqueWindowState != null) {
WindowManager.LayoutParams lp =
mTopFullscreenOpaqueWindowState.getAttrs();
boolean hideStatusBar =
(lp.flags & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0;
if (hideStatusBar) {
mStatusBar.hideLw();
mStatusBar.hideLw(true);
} else {
mStatusBar.showLw();
mStatusBar.showLw(true);
}
}
}