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

* commit '39f0e7da00eae4e5a331a9413a396f3dddbeb625':
  Using outset bottom from theme as bottom inset on circular screens.
This commit is contained in:
Filip Gruszczynski
2014-07-17 10:55:43 +00:00
committed by Android Git Automerger

View File

@@ -88,6 +88,7 @@ import android.view.ViewParent;
import android.view.ViewRootImpl;
import android.view.ViewStub;
import android.view.Window;
import android.view.WindowInsets;
import android.view.WindowManager;
import android.view.accessibility.AccessibilityEvent;
import android.view.accessibility.AccessibilityManager;
@@ -2093,6 +2094,22 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
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
public boolean onTouchEvent(MotionEvent event) {
return onInterceptTouchEvent(event);