summaryrefslogtreecommitdiffstats
path: root/src_ui_overrides
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-03-22 02:52:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-03-22 02:52:42 +0000
commitfa03e181cfd88615cdc513724ade8830cc27e8be (patch)
tree89bd3a2262b14b662bb24e194dac9332d595bcab /src_ui_overrides
parent84aa5ef1dc0952f29705f978d38dab9a5fc39806 (diff)
parenta97f0f20cd6ad51b3e920c923d21148234e5f728 (diff)
downloadandroid_packages_apps_Trebuchet-fa03e181cfd88615cdc513724ade8830cc27e8be.tar.gz
android_packages_apps_Trebuchet-fa03e181cfd88615cdc513724ade8830cc27e8be.tar.bz2
android_packages_apps_Trebuchet-fa03e181cfd88615cdc513724ade8830cc27e8be.zip
Merge "Support multiple Views of extra hotseat content" into ub-launcher3-master
Diffstat (limited to 'src_ui_overrides')
-rw-r--r--src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
index c4b4a4585..94abcce57 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/UiFactory.java
@@ -48,7 +48,7 @@ public class UiFactory {
public static void onTrimMemory(Launcher launcher, int level) { }
- public static View getHotseatExtraContent(Hotseat hotseat) {
- return null;
+ public static View[] getHotseatExtraContent(Hotseat hotseat) {
+ return new View[0];
}
}