diff options
author | Winson Chung <winsonc@google.com> | 2011-07-27 17:46:20 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-07-29 11:34:23 -0700 |
commit | 4afe9b31f51022538b30646fe83780e83bf22490 (patch) | |
tree | 24d7c49cb86a062f7a430166a3f7416565896ee8 /src/com/android/launcher2/AppsCustomizeTabHost.java | |
parent | fec9786f2e7171f6616b8258a8dee8be2d5f1fd4 (diff) | |
download | android_packages_apps_Trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.tar.gz android_packages_apps_Trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.tar.bz2 android_packages_apps_Trebuchet-4afe9b31f51022538b30646fe83780e83bf22490.zip |
Adding ability to add to hotseat from spring loaded mode (5064141).
- Fixing regression where folder items had no text in tablet ui and assets
- Fixing spring loaded frame sizing (5067335)
- Making the cells 80x80 for testing again on the phone ui (5085986)
Change-Id: I52a0f5eaf2dcf4adaf57c5a71da3903892c490a8
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizeTabHost.java')
-rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index c2d13410d..b6bc5dc52 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -183,7 +183,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(android.animation.Animator animation) { - mAppsCustomizePane.flashScrollingIndicator(); + if (!LauncherApplication.isScreenLarge()) { + mAppsCustomizePane.flashScrollingIndicator(); + } } }); anim.start(); @@ -250,7 +252,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona setLayerType(LAYER_TYPE_NONE, null); } - if (!toWorkspace) { + if (!toWorkspace && !LauncherApplication.isScreenLarge()) { mAppsCustomizePane.flashScrollingIndicator(); } } |