From 925c65863136c6b23aa09fa77ba480709d2920e7 Mon Sep 17 00:00:00 2001 From: Taran Singh Date: Wed, 12 Feb 2020 19:07:46 +0000 Subject: [PATCH] Revert "Revert "Enable insets flag for IME"" This reverts commit d01913ae835e47974f1dffce715748f40a008b78. Reason for revert: We're ready to re-enable the flag since b/149121559 is fixed Change-Id: I1aca81bb6c2dbb544841a2a6d17ef477cb8bdc9e --- core/java/android/view/ViewRootImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 159b93eb12dda..2c30d29d8da26 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -218,13 +218,6 @@ public final class ViewRootImpl implements ViewParent, */ private static final String USE_NEW_INSETS_PROPERTY = "persist.debug.new_insets"; - /** - * @see #USE_NEW_INSETS_PROPERTY - * @hide - */ - public static int sNewInsetsMode = - SystemProperties.getInt(USE_NEW_INSETS_PROPERTY, 0); - /** * @see #USE_NEW_INSETS_PROPERTY * @hide @@ -243,6 +236,13 @@ public final class ViewRootImpl implements ViewParent, */ public static final int NEW_INSETS_MODE_FULL = 2; + /** + * @see #USE_NEW_INSETS_PROPERTY + * @hide + */ + public static int sNewInsetsMode = + SystemProperties.getInt(USE_NEW_INSETS_PROPERTY, NEW_INSETS_MODE_IME); + /** * Set this system property to true to force the view hierarchy to render * at 60 Hz. This can be used to measure the potential framerate.