diff options
| author | Winson Chung <winsonc@google.com> | 2011-04-14 16:08:02 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-04-22 12:53:59 -0700 |
| commit | 785d2eb2b8d7072c8124300dd9168ff51a91cf38 (patch) | |
| tree | a87bc934f8496b2dead1e508260d88c978a038ce /src/com/android/launcher2/AllAppsTabbed.java | |
| parent | f579b5041afe8272c79f9f13001120d37eeeee7b (diff) | |
| download | android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.tar.gz android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.tar.bz2 android_packages_apps_Trebuchet-785d2eb2b8d7072c8124300dd9168ff51a91cf38.zip | |
Initial changes to merged AllApps/Customize pane in the Phone UI.
Change-Id: Ifa1676736033fe617dd0cca965156c38fa452948
Diffstat (limited to 'src/com/android/launcher2/AllAppsTabbed.java')
| -rw-r--r-- | src/com/android/launcher2/AllAppsTabbed.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher2/AllAppsTabbed.java b/src/com/android/launcher2/AllAppsTabbed.java index 2deec8e1a..96de5a733 100644 --- a/src/com/android/launcher2/AllAppsTabbed.java +++ b/src/com/android/launcher2/AllAppsTabbed.java @@ -103,7 +103,7 @@ public class AllAppsTabbed extends TabHost implements AllAppsView, LauncherTrans public void onTabChanged(String tabId) { // animate the changing of the tab content by fading pages in and out final Resources res = getResources(); - final int duration = res.getInteger(R.integer.config_tabTransitionTime); + final int duration = res.getInteger(R.integer.config_tabTransitionDuration); final float alpha = mAllApps.getAlpha(); ValueAnimator alphaAnim = ObjectAnimator.ofFloat(mAllApps, "alpha", alpha, 0.0f). setDuration(duration); @@ -143,14 +143,9 @@ public class AllAppsTabbed extends TabHost implements AllAppsView, LauncherTrans } @Override - public void setLauncher(Launcher launcher) { - mAllApps.setLauncher(launcher); + public void setup(Launcher launcher, DragController dragController) { mLauncher = launcher; - } - - @Override - public void setDragController(DragController dragger) { - mAllApps.setDragController(dragger); + mAllApps.setup(launcher, dragController); } @Override |