summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Gruszczynski <gruszczy@google.com>2014-07-28 23:40:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-28 23:40:13 +0000
commit896a82d77e732c7387b2279bcdd0f04d696b13df (patch)
tree273152964a3989a8b96c1ecd4ff787ccec47c6d6
parent09875ec7292b19e07c38b6127406d6aa7490e26c (diff)
parentd0e03392394164e1e261ef8829e187ad2362d426 (diff)
downloadframeworks_base-896a82d77e732c7387b2279bcdd0f04d696b13df.zip
frameworks_base-896a82d77e732c7387b2279bcdd0f04d696b13df.tar.gz
frameworks_base-896a82d77e732c7387b2279bcdd0f04d696b13df.tar.bz2
am d0e03392: Merge "Fix double chin issue, where bottom inset is applied twice." into klp-modular-dev
* commit 'd0e03392394164e1e261ef8829e187ad2362d426': Fix double chin issue, where bottom inset is applied twice.
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index fe3021b..d68e351 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -2102,8 +2102,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
int bottom = (int) mOutsetBottom.getDimension(metrics);
WindowInsets newInsets = insets.replaceSystemWindowInsets(
insets.getSystemWindowInsetLeft(), insets.getSystemWindowInsetTop(),
- insets.getSystemWindowInsetRight(),
- insets.getSystemWindowInsetBottom() + bottom);
+ insets.getSystemWindowInsetRight(), bottom);
return super.dispatchApplyWindowInsets(newInsets);
} else {
return super.dispatchApplyWindowInsets(insets);