drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only use bottom outset for main display." into klp-modular-dev

Browse Source
This commit is contained in:
Filip Gruszczynski
2014-07-17 19:52:25 +00:00
committed by Android (Google) Code Review
parent e1e81a9ee0 b57503c34d
commit a76164e1d0
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
policy/src/com/android/internal/policy/impl/PhoneWindow.java
View File

@ -69,6 +69,7 @@ import android.util.SparseArray;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.ActionMode; import android.view.ActionMode;
import android.view.ContextThemeWrapper; import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.Gravity; import android.view.Gravity;
import android.view.IRotationWatcher; import android.view.IRotationWatcher;
import android.view.IWindowManager; import android.view.IWindowManager;
@ -2941,9 +2942,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
a.getValue(com.android.internal.R.styleable.Window_windowFixedHeightMinor, a.getValue(com.android.internal.R.styleable.Window_windowFixedHeightMinor,
mFixedHeightMinor); mFixedHeightMinor);
} }
if (a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {
if (mOutsetBottom == null) mOutsetBottom = new TypedValue(); final WindowManager windowService = (WindowManager) getContext().getSystemService(
a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom, mOutsetBottom); Context.WINDOW_SERVICE);
if (windowService != null) {
final Display display = windowService.getDefaultDisplay();
if (display.getDisplayId() == Display.DEFAULT_DISPLAY &&
a.hasValue(com.android.internal.R.styleable.Window_windowOutsetBottom)) {
if (mOutsetBottom == null) mOutsetBottom = new TypedValue();
a.getValue(com.android.internal.R.styleable.Window_windowOutsetBottom,
mOutsetBottom);
}
} }
final Context context = getContext(); final Context context = getContext();