summaryrefslogtreecommitdiff
path: root/core/java/android/view/InsetsAnimationControlImpl.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2019-01-14 13:06:23 +0100
committerJorim Jaggi <jjaggi@google.com>2019-01-21 23:13:05 +0100
commit73f3e8ad3eba708d5d15c2cfe73b048b667bfb92 (patch)
treed1daca3f602b4a5e50bfe411039814fcad5fafbc /core/java/android/view/InsetsAnimationControlImpl.java
parent66e01c2fdf2a925b905554abae17e69b446387c9 (diff)
Introduce new window insets launch flag
Instead of turning off the new window insets system fully on or off, we introduce three modes: 0: Old system 1: New system for IME only 2: New system for IME + system bars This allows us to launch the feature in IME only mode, in order to avoid a lot of compatibility fallout around system bars. Test: adb shell setprop persist.wm.new_insets 0/1/2 Bug: 118118435 Change-Id: Iaa49e62930b2539770cd313567dde4b102216097
Diffstat (limited to 'core/java/android/view/InsetsAnimationControlImpl.java')
-rw-r--r--core/java/android/view/InsetsAnimationControlImpl.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java
index ce71b07da805..7c1465b443e4 100644
--- a/core/java/android/view/InsetsAnimationControlImpl.java
+++ b/core/java/android/view/InsetsAnimationControlImpl.java
@@ -161,8 +161,9 @@ public class InsetsAnimationControlImpl implements WindowInsetsAnimationControll
private Insets getInsetsFromState(InsetsState state, Rect frame,
@Nullable @InsetSide SparseIntArray typeSideMap) {
return state.calculateInsets(frame, false /* isScreenRound */,
- false /* alwaysConsumerNavBar */, null /* displayCutout */, typeSideMap)
- .getInsets(mTypes);
+ false /* alwaysConsumerNavBar */, null /* displayCutout */,
+ null /* legacyContentInsets */, null /* legacyStableInsets */, typeSideMap)
+ .getInsets(mTypes);
}
private Insets sanitize(Insets insets) {