From 11dfd279a33e126d2df847656bf73fd92df79218 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 25 Mar 2019 19:21:26 +0100 Subject: WindowInsets: populate system gesture and tappable element insets Also fixes an infinite recursion when invoking TestableContext.(un)registerComponentCallbacks(). Test: atest WindowInsetsPolicyTest Bug: 126511573 Change-Id: I5c9f40054493a83746bce6124d72412e8eb8a0d1 --- core/java/android/view/WindowInsets.java | 7 ------- 1 file changed, 7 deletions(-) (limited to 'core/java/android/view/WindowInsets.java') diff --git a/core/java/android/view/WindowInsets.java b/core/java/android/view/WindowInsets.java index ffa769a424a9..2d292ef7b25c 100644 --- a/core/java/android/view/WindowInsets.java +++ b/core/java/android/view/WindowInsets.java @@ -29,9 +29,6 @@ import static android.view.WindowInsets.Type.TOP_BAR; import static android.view.WindowInsets.Type.all; import static android.view.WindowInsets.Type.compatSystemInsets; import static android.view.WindowInsets.Type.indexOf; -import static android.view.WindowInsets.Type.mandatorySystemGestures; -import static android.view.WindowInsets.Type.systemGestures; -import static android.view.WindowInsets.Type.tappableElement; import android.annotation.IntDef; import android.annotation.IntRange; @@ -225,10 +222,6 @@ public final class WindowInsets { } Insets[] typeInsetMap = new Insets[SIZE]; assignCompatInsets(typeInsetMap, insets); - // TODO: set system gesture insets based on actual system gesture area. - typeInsetMap[indexOf(systemGestures())] = Insets.of(insets); - typeInsetMap[indexOf(mandatorySystemGestures())] = Insets.of(insets); - typeInsetMap[indexOf(tappableElement())] = Insets.of(insets); return typeInsetMap; } -- cgit v1.2.3