summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/testing
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-09 01:37:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-10-09 01:37:39 +0000
commit37860923619b1e467975a74764dff03ab657bdc7 (patch)
treeea768ff96a52a7c8f56ee7b0d3ec556105bd3456 /src/com/android/launcher3/testing
parentd6b4037b093445fefa7d036da339dd549fae7a9b (diff)
parent55616cd363202eccf7a9f9a5af00d12997c24b19 (diff)
downloadandroid_packages_apps_Trebuchet-37860923619b1e467975a74764dff03ab657bdc7.tar.gz
android_packages_apps_Trebuchet-37860923619b1e467975a74764dff03ab657bdc7.tar.bz2
android_packages_apps_Trebuchet-37860923619b1e467975a74764dff03ab657bdc7.zip
Merge "Added launcher callback to specify search bar height." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/testing')
-rw-r--r--src/com/android/launcher3/testing/LauncherExtension.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/testing/LauncherExtension.java b/src/com/android/launcher3/testing/LauncherExtension.java
index dac279afa..3364fcc9f 100644
--- a/src/com/android/launcher3/testing/LauncherExtension.java
+++ b/src/com/android/launcher3/testing/LauncherExtension.java
@@ -303,6 +303,11 @@ public class LauncherExtension extends Launcher {
}
@Override
+ public int getSearchBarHeight() {
+ return SEARCH_BAR_HEIGHT_NORMAL;
+ }
+
+ @Override
public boolean isLauncherPreinstalled() {
return false;
}