summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/AppsCustomizeLayout.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-28 11:07:57 -0700
committerDanesh M <daneshm90@gmail.com>2014-06-05 23:11:10 -0700
commit80469bd3c32942de1f26ec2a529ec6f2bcb4a844 (patch)
tree623bfc984008458816b3938d23fd7ac933ed44b6 /src/com/android/launcher3/AppsCustomizeLayout.java
parent86c440e06a469a32f382804601bdc8a4f460ecc4 (diff)
downloadandroid_packages_apps_Trebuchet-80469bd3c32942de1f26ec2a529ec6f2bcb4a844.tar.gz
android_packages_apps_Trebuchet-80469bd3c32942de1f26ec2a529ec6f2bcb4a844.tar.bz2
android_packages_apps_Trebuchet-80469bd3c32942de1f26ec2a529ec6f2bcb4a844.zip
Ensuring the widget page is full when shown (Bug 10883258)
Change-Id: I9481b5551a2efc093d0fb81fc62a811b34d93d7c
Diffstat (limited to 'src/com/android/launcher3/AppsCustomizeLayout.java')
-rw-r--r--src/com/android/launcher3/AppsCustomizeLayout.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher3/AppsCustomizeLayout.java b/src/com/android/launcher3/AppsCustomizeLayout.java
index 7bcb90f18..a560635ae 100644
--- a/src/com/android/launcher3/AppsCustomizeLayout.java
+++ b/src/com/android/launcher3/AppsCustomizeLayout.java
@@ -136,6 +136,10 @@ public class AppsCustomizeLayout extends FrameLayout implements LauncherTransiti
@Override
public View getContent() {
+ View appsCustomizeContent = mAppsCustomizePane.getContent();
+ if (appsCustomizeContent != null) {
+ return appsCustomizeContent;
+ }
return mContent;
}
@@ -176,7 +180,7 @@ public class AppsCustomizeLayout extends FrameLayout implements LauncherTransiti
@Override
public void onLauncherTransitionStep(Launcher l, float t) {
- // Do nothing
+ mAppsCustomizePane.onLauncherTransitionStep(l, t);
}
@Override