summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3
diff options
context:
space:
mode:
authorvadimt <vadimt@google.com>2019-07-17 16:27:12 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-17 16:27:12 -0700
commit2254bcae3fda8bec18abced2d00e5ed0f539db9e (patch)
treeba37932e23e2f8bdb5d03faedad305fa5480bb28 /src/com/android/launcher3
parente5cb05f405a8f0469c64db1938688d0222c433b6 (diff)
parentaaf6c7ce56373aaf1b5a18054539abbf07c07459 (diff)
downloadandroid_packages_apps_Trebuchet-2254bcae3fda8bec18abced2d00e5ed0f539db9e.tar.gz
android_packages_apps_Trebuchet-2254bcae3fda8bec18abced2d00e5ed0f539db9e.tar.bz2
android_packages_apps_Trebuchet-2254bcae3fda8bec18abced2d00e5ed0f539db9e.zip
Merge "Using correct gesture margins in overview" into ub-launcher3-qt-r1-dev
am: aaf6c7ce56 Change-Id: I9e32e16101a837a61c9488f4b0d4484982778092
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r--src/com/android/launcher3/testing/TestProtocol.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java
index f69b27896..079ab6d8f 100644
--- a/src/com/android/launcher3/testing/TestProtocol.java
+++ b/src/com/android/launcher3/testing/TestProtocol.java
@@ -71,6 +71,8 @@ public final class TestProtocol {
public static final String REQUEST_FREEZE_APP_LIST = "freeze-app-list";
public static final String REQUEST_UNFREEZE_APP_LIST = "unfreeze-app-list";
public static final String REQUEST_APP_LIST_FREEZE_FLAGS = "app-list-freeze-flags";
+ public static final String REQUEST_OVERVIEW_LEFT_GESTURE_MARGIN = "overview-left-margin";
+ public static final String REQUEST_OVERVIEW_RIGHT_GESTURE_MARGIN = "overview-right-margin";
public static boolean sDebugTracing = false;
public static final String REQUEST_ENABLE_DEBUG_TRACING = "enable-debug-tracing";