Skip to content

Commit 908e71e

Browse files
Dianne HackbornAndroid (Google) Code Review
authored andcommitted
Merge "Fix issue #5983781: opening a post from status tab..."
2 parents 4797d57 + 560144e commit 908e71e

File tree

1 file changed

+0
-23
lines changed

1 file changed

+0
-23
lines changed

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
309309
WindowState mStatusBar = null;
310310
boolean mHasSystemNavBar;
311311
int mStatusBarHeight;
312-
final ArrayList<WindowState> mStatusBarSubPanels = new ArrayList<WindowState>();
313312
WindowState mNavigationBar = null;
314313
boolean mHasNavigationBar = false;
315314
boolean mCanHideNavigationBar = false;
@@ -1596,7 +1595,6 @@ public int prepareAddWindowLw(WindowState win, WindowManager.LayoutParams attrs)
15961595
mContext.enforceCallingOrSelfPermission(
15971596
android.Manifest.permission.STATUS_BAR_SERVICE,
15981597
"PhoneWindowManager");
1599-
mStatusBarSubPanels.add(win);
16001598
break;
16011599
case TYPE_KEYGUARD:
16021600
if (mKeyguard != null) {
@@ -1616,8 +1614,6 @@ public void removeWindowLw(WindowState win) {
16161614
mKeyguard = null;
16171615
} else if (mNavigationBar == win) {
16181616
mNavigationBar = null;
1619-
} else {
1620-
mStatusBarSubPanels.remove(win);
16211617
}
16221618
}
16231619

@@ -2789,25 +2785,6 @@ public boolean allowAppAnimationsLw() {
27892785
// behind it.
27902786
return false;
27912787
}
2792-
if (mStatusBar != null && mStatusBar.isVisibleLw()) {
2793-
RectF rect = new RectF(mStatusBar.getShownFrameLw());
2794-
for (int i=mStatusBarSubPanels.size()-1; i>=0; i--) {
2795-
WindowState w = mStatusBarSubPanels.get(i);
2796-
if (w.isVisibleLw()) {
2797-
rect.union(w.getShownFrameLw());
2798-
}
2799-
}
2800-
final int insetw = mRestrictedScreenWidth/10;
2801-
final int inseth = mRestrictedScreenHeight/10;
2802-
if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw,
2803-
mRestrictedScreenHeight-inseth)) {
2804-
// All of the status bar windows put together cover the
2805-
// screen, so the app can't be seen. (Note this test doesn't
2806-
// work if the rects of these windows are at odd offsets or
2807-
// sizes, causing gaps in the rect union we have computed.)
2808-
return false;
2809-
}
2810-
}
28112788
return true;
28122789
}
28132790

0 commit comments

Comments
 (0)