diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-11-13 22:03:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-13 22:03:11 +0000 |
commit | 49e72ac059ea24642c07e0a4046f7d7964c4a65c (patch) | |
tree | 43d8798850e0bb8e79a0bd47c36df011efd80e65 /src/com/android/launcher3/testing | |
parent | d9dd8ef3babff6484d79859294682863dde37d39 (diff) | |
parent | ec7c044c89fb9168d44b81c58325aaba3ec73606 (diff) | |
download | android_packages_apps_Trebuchet-49e72ac059ea24642c07e0a4046f7d7964c4a65c.tar.gz android_packages_apps_Trebuchet-49e72ac059ea24642c07e0a4046f7d7964c4a65c.tar.bz2 android_packages_apps_Trebuchet-49e72ac059ea24642c07e0a4046f7d7964c4a65c.zip |
Merge "Tapl: AllApps: ensuring a minimal vertical size of an icon" into ub-launcher3-qt-future-dev
Diffstat (limited to 'src/com/android/launcher3/testing')
-rw-r--r-- | src/com/android/launcher3/testing/TestInformationHandler.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/testing/TestProtocol.java | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/launcher3/testing/TestInformationHandler.java b/src/com/android/launcher3/testing/TestInformationHandler.java index cc2d586e2..c6de9ca90 100644 --- a/src/com/android/launcher3/testing/TestInformationHandler.java +++ b/src/com/android/launcher3/testing/TestInformationHandler.java @@ -151,6 +151,12 @@ public class TestInformationHandler implements ResourceBasedOverride { mLeaks.add(bitmap); break; } + + case TestProtocol.REQUEST_ICON_HEIGHT: { + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + mDeviceProfile.allAppsCellHeightPx); + break; + } } return response; } diff --git a/src/com/android/launcher3/testing/TestProtocol.java b/src/com/android/launcher3/testing/TestProtocol.java index 62bb56404..07ddbdc4e 100644 --- a/src/com/android/launcher3/testing/TestProtocol.java +++ b/src/com/android/launcher3/testing/TestProtocol.java @@ -66,6 +66,8 @@ public final class TestProtocol { "all-apps-to-overview-swipe-height"; public static final String REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT = "home-to-all-apps-swipe-height"; + public static final String REQUEST_ICON_HEIGHT = + "icon-height"; public static final String REQUEST_HOTSEAT_TOP = "hotseat-top"; public static final String REQUEST_IS_LAUNCHER_INITIALIZED = "is-launcher-initialized"; public static final String REQUEST_FREEZE_APP_LIST = "freeze-app-list"; |