commit d98f8e10356b2fbca8c98004bd636143ad8aa3be
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 13 16:43:08 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 13 16:43:08 2018 +0000
tree 3098c033a8268969f14bf4afdcfd976baa230c7f
parent c7ee6802c588868dcdaadd3c9a2be004d55d7134
parent f3dbad134b4bc2958b84d90bc1ae9376d656c348

Merge "Fixing wrong cliping height when screenshot is rotated" into ub-launcher3-master

quickstep/libs/sysui_shared.jar

diff --git a/quickstep/libs/sysui_shared.jar b/quickstep/libs/sysui_shared.jar
index 454260e..41f5bb8 100644
--- a/quickstep/libs/sysui_shared.jar
+++ b/quickstep/libs/sysui_shared.jar
Binary files differ

quickstep/src/com/android/quickstep/OverviewInteractionState.java

diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
index 0c24e22..8923608 100644
--- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java
+++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
@@ -19,6 +19,7 @@
 import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_SWIPE_UP;
 import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_HIDE_BACK_BUTTON;
 import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON;
+import static com.android.systemui.shared.system.SettingsCompat.SWIPE_UP_SETTING_NAME;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -74,7 +75,6 @@
     private static final int MSG_SET_BACK_BUTTON_VISIBLE = 201;
     private static final int MSG_SET_SWIPE_UP_ENABLED = 202;
 
-    private static final String SWIPE_UP_SETTING_NAME = "swipe_up_to_switch_apps_enabled";
     private final SwipeUpGestureEnabledSettingObserver mSwipeUpSettingObserver;
 
     private final Handler mUiHandler;