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

Merge "Using outset bottom from theme as bottom inset on circular screens." into klp-modular-dev

Browse Source
This commit is contained in:
Filip Gruszczynski
2014-07-17 00:23:35 +00:00
committed by Android (Google) Code Review
parent 289d3c253e dcb70c2e08
commit 39f0e7da00
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,6 +88,7 @@ import android.view.ViewParent;
import android.view.ViewRootImpl; import android.view.ViewRootImpl;
import android.view.ViewStub; import android.view.ViewStub;
import android.view.Window; import android.view.Window;
import android.view.WindowInsets;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
@ -2093,6 +2094,22 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
return super.dispatchGenericMotionEvent(event); return super.dispatchGenericMotionEvent(event);
} }
@Override
public WindowInsets dispatchApplyWindowInsets(WindowInsets insets) {
if (mOutsetBottom != null) {
final DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
int bottom = (int) mOutsetBottom.getDimension(metrics);
WindowInsets newInsets = insets.replaceSystemWindowInsets(
insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(),
insets.getSystemWindowInsetRight(),
insets.getSystemWindowInsetBottom() + bottom);
return super.dispatchApplyWindowInsets(newInsets);
} else {
return super.dispatchApplyWindowInsets(insets);
}
}
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
return onInterceptTouchEvent(event); return onInterceptTouchEvent(event);