summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2019-12-18 09:42:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-12-18 09:42:08 +0000
commitcc64caeacf217dfa6ea15a03b271327470a2a54b (patch)
tree03e2d5768c8eddb05ee27b4f8e7c7c0718e8adce /core/java/android
parent10286bb061d9f9cb78c30d1f38bee1e86de3a396 (diff)
parentf7146a989d59d8a05ae78f3ce055d3af35aa463e (diff)
Merge "Revert "Enable IME Insets flag""
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/ViewRootImpl.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index df6f3b80d11c..e3f0da1bdd5c 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -211,26 +211,26 @@ public final class ViewRootImpl implements ViewParent,
* @see #USE_NEW_INSETS_PROPERTY
* @hide
*/
- public static final int NEW_INSETS_MODE_NONE = 0;
+ public static int sNewInsetsMode =
+ SystemProperties.getInt(USE_NEW_INSETS_PROPERTY, 0);
/**
* @see #USE_NEW_INSETS_PROPERTY
* @hide
*/
- public static final int NEW_INSETS_MODE_IME = 1;
+ public static final int NEW_INSETS_MODE_NONE = 0;
/**
* @see #USE_NEW_INSETS_PROPERTY
* @hide
*/
- public static final int NEW_INSETS_MODE_FULL = 2;
+ public static final int NEW_INSETS_MODE_IME = 1;
/**
* @see #USE_NEW_INSETS_PROPERTY
* @hide
*/
- public static int sNewInsetsMode =
- SystemProperties.getInt(USE_NEW_INSETS_PROPERTY, NEW_INSETS_MODE_IME);
+ public static final int NEW_INSETS_MODE_FULL = 2;
/**
* Set this system property to true to force the view hierarchy to render