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

am 41ba84e5: am c82b01a5: am 23c51de9: resolved conflicts for merge of bbc49941 to lmp-dev

Browse Source 
* commit '41ba84e5b6b763e1fe3fbc4fffa15ebf5aee074e':
  Only use bottom outset for main display.
This commit is contained in:
Filip Gruszczynski
2014-07-18 02:57:40 +00:00
committed by Android Git Automerger
parent 51d6d9db64 963a87ebb3
commit a051400fae
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

@@ -71,6 +71,7 @@ import android.util.SparseArray;
import android.util.TypedValue;
import android.view.ActionMode;
import android.view.ContextThemeWrapper;
import android.view.Display;
import android.view.Gravity;
import android.view.IRotationWatcher;
import android.view.IWindowManager;
@@ -3182,9 +3183,17 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
if (a.getBoolean(com.android.internal.R.styleable.Window_windowContentTransitions, false)) {
requestFeature(FEATURE_CONTENT_TRANSITIONS);
}
if (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 WindowManager windowService = (WindowManager) getContext().getSystemService(
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();