summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/testing
diff options
context:
space:
mode:
authorTony Wickham <twickham@google.com>2015-10-09 01:40:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-10-09 01:40:31 +0000
commitfa3c369cc30345e23b2b90415a3348490dd2a0b2 (patch)
tree778e077115de160b16a2ea3401e8da3f7ae2dc0d /src/com/android/launcher3/testing
parentd70a4b7b7805f0fd61cb34487b4f6cc620025723 (diff)
parent37860923619b1e467975a74764dff03ab657bdc7 (diff)
downloadandroid_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.tar.gz
android_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.tar.bz2
android_packages_apps_Trebuchet-fa3c369cc30345e23b2b90415a3348490dd2a0b2.zip
am 37860923: Merge "Added launcher callback to specify search bar height." into ub-launcher3-burnaby
* commit '37860923619b1e467975a74764dff03ab657bdc7': Added launcher callback to specify search bar height.
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;
}