diff options
| author | Jonathan Miranda <jonmiranda@google.com> | 2017-03-15 15:31:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 15:31:52 +0000 |
| commit | d8b607fe8c24c904a11f92b4aa23685e6f4abb41 (patch) | |
| tree | 5475aee89daade0790c0095fefcca5c910950095 /src/com/android/launcher3/Launcher.java | |
| parent | 32c3184d5b9e1ee10715fd876cd629f54ac31053 (diff) | |
| parent | aa8780a00c494b07e9948dc939178a33f8267cf5 (diff) | |
| download | android_packages_apps_Trebuchet-d8b607fe8c24c904a11f92b4aa23685e6f4abb41.tar.gz android_packages_apps_Trebuchet-d8b607fe8c24c904a11f92b4aa23685e6f4abb41.tar.bz2 android_packages_apps_Trebuchet-d8b607fe8c24c904a11f92b4aa23685e6f4abb41.zip | |
Merge "Remove WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED." into ub-launcher3-dorval
am: aa8780a00c
Change-Id: Ia4c3479d61d6d9ed599b40c468a7f697b0024a49
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index a69f501d7..d5baabfc0 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -176,11 +176,9 @@ public class Launcher extends BaseActivity protected static final int REQUEST_LAST = 100; private static final int SOFT_INPUT_MODE_DEFAULT = - WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN - | WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED; + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN; private static final int SOFT_INPUT_MODE_ALL_APPS = - WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE - | WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED; + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE; // The Intent extra that defines whether to ignore the launch animation static final String INTENT_EXTRA_IGNORE_LAUNCH_ANIMATION = |