Skip to content

Commit 560144e

Browse files
author
Dianne Hackborn
committed
Fix issue #5983781: opening a post from status tab...
...has no cross-activity transition We apparently no longer want to skip the activity transition when it is starting from behind the status bar. Change-Id: I1feb0cf0303f8b89d9089b38b217eac440382059
1 parent ec04678 commit 560144e

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
@@ -306,7 +306,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
306306
WindowState mStatusBar = null;
307307
boolean mHasSystemNavBar;
308308
int mStatusBarHeight;
309-
final ArrayList<WindowState> mStatusBarSubPanels = new ArrayList<WindowState>();
310309
WindowState mNavigationBar = null;
311310
boolean mHasNavigationBar = false;
312311
boolean mCanHideNavigationBar = false;
@@ -1586,7 +1585,6 @@ public int prepareAddWindowLw(WindowState win, WindowManager.LayoutParams attrs)
15861585
mContext.enforceCallingOrSelfPermission(
15871586
android.Manifest.permission.STATUS_BAR_SERVICE,
15881587
"PhoneWindowManager");
1589-
mStatusBarSubPanels.add(win);
15901588
break;
15911589
case TYPE_KEYGUARD:
15921590
if (mKeyguard != null) {
@@ -1606,8 +1604,6 @@ public void removeWindowLw(WindowState win) {
16061604
mKeyguard = null;
16071605
} else if (mNavigationBar == win) {
16081606
mNavigationBar = null;
1609-
} else {
1610-
mStatusBarSubPanels.remove(win);
16111607
}
16121608
}
16131609

@@ -2778,25 +2774,6 @@ public boolean allowAppAnimationsLw() {
27782774
// behind it.
27792775
return false;
27802776
}
2781-
if (mStatusBar != null && mStatusBar.isVisibleLw()) {
2782-
RectF rect = new RectF(mStatusBar.getShownFrameLw());
2783-
for (int i=mStatusBarSubPanels.size()-1; i>=0; i--) {
2784-
WindowState w = mStatusBarSubPanels.get(i);
2785-
if (w.isVisibleLw()) {
2786-
rect.union(w.getShownFrameLw());
2787-
}
2788-
}
2789-
final int insetw = mRestrictedScreenWidth/10;
2790-
final int inseth = mRestrictedScreenHeight/10;
2791-
if (rect.contains(insetw, inseth, mRestrictedScreenWidth-insetw,
2792-
mRestrictedScreenHeight-inseth)) {
2793-
// All of the status bar windows put together cover the
2794-
// screen, so the app can't be seen. (Note this test doesn't
2795-
// work if the rects of these windows are at odd offsets or
2796-
// sizes, causing gaps in the rect union we have computed.)
2797-
return false;
2798-
}
2799-
}
28002777
return true;
28012778
}
28022779

0 commit comments

Comments
 (0)