am 8487c937: Merge "More inclusive rules for using outsets." into cw-d-mr1-dev

* commit '8487c937fb7eb8159e472011074eaa5f5d51405e':
  More inclusive rules for using outsets.
This commit is contained in:
Filip Gruszczynski
2015-06-03 22:45:59 +00:00
committed by Android Git Automerger

View File

@@ -4028,7 +4028,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// If the device has a chin (e.g. some watches), a dead area at the bottom of the screen we
// need to provide information to the clients that want to pretend that you can draw there.
if (isDefaultDisplay && (fl & WindowManager.LayoutParams.FLAG_FULLSCREEN) != 0) {
// We only want to apply outsets to certain types of windows. For example, we never want to
// apply the outsets to floating dialogs, because they wouldn't make sense there.
final boolean useOutsets = attrs.type == TYPE_WALLPAPER
|| (fl & (WindowManager.LayoutParams.FLAG_FULLSCREEN
| WindowManager.LayoutParams.FLAG_LAYOUT_IN_OVERSCAN)) != 0;
if (isDefaultDisplay && useOutsets) {
osf = mTmpOutsetFrame;
osf.set(cf.left, cf.top, cf.right, cf.bottom);
int outset = ScreenShapeHelper.getWindowOutsetBottomPx(mContext.getResources());