summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AppsCustomizeTabHost.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-28 11:07:57 -0700
committerWinson Chung <winsonc@google.com>2013-10-28 11:07:57 -0700
commit7bb3752d20217713053352082d1e6e4074827467 (patch)
treee5d4ab550c8f805e0c9c1b1dccb4beec03371426 /src/com/android/launcher3/AppsCustomizeTabHost.java
parent1fa05179eb4ccbe264c67b6acb3abf2793b03197 (diff)
downloadandroid_packages_apps_Trebuchet-7bb3752d20217713053352082d1e6e4074827467.tar.gz
android_packages_apps_Trebuchet-7bb3752d20217713053352082d1e6e4074827467.tar.bz2
android_packages_apps_Trebuchet-7bb3752d20217713053352082d1e6e4074827467.zip
Ensuring the widget page is full when shown (Bug 10883258)
Change-Id: I9481b5551a2efc093d0fb81fc62a811b34d93d7c
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizeTabHost.java')
-rw-r--r--src/com/android/launcher3/AppsCustomizeTabHost.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppsCustomizeTabHost.java b/src/com/android/launcher3/AppsCustomizeTabHost.java
index bfcf92ac2..697bd7ecf 100644
--- a/src/com/android/launcher3/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher3/AppsCustomizeTabHost.java
@@ -367,6 +367,10 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
@Override
public View getContent() {
+ View appsCustomizeContent = mAppsCustomizePane.getContent();
+ if (appsCustomizeContent != null) {
+ return appsCustomizeContent;
+ }
return mContent;
}
@@ -397,6 +401,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
@Override
public void onLauncherTransitionStart(Launcher l, boolean animated, boolean toWorkspace) {
+ mAppsCustomizePane.onLauncherTransitionStart(l, animated, toWorkspace);
if (animated) {
enableAndBuildHardwareLayer();
}
@@ -407,7 +412,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
@Override
public void onLauncherTransitionStep(Launcher l, float t) {
- // Do nothing
+ mAppsCustomizePane.onLauncherTransitionStep(l, t);
}
@Override