diff options
| author | Ed Heyl <ed@google.com> | 2012-07-25 15:04:00 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-25 15:04:00 -0700 |
| commit | 8165f0dd202a2c0fbf0816f7613d66938955dc76 (patch) | |
| tree | 2c14522ad8a3a3150417c53664c0266874a76fc8 /src/com/android/launcher2/AppsCustomizeTabHost.java | |
| parent | 90abcc94258ba9d9c8b68ac9764b6ab1eba12985 (diff) | |
| parent | 4f174f1d27adbde6f50e11ee3a8eaf162a030284 (diff) | |
| download | android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.tar.gz android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.tar.bz2 android_packages_apps_Trebuchet-8165f0dd202a2c0fbf0816f7613d66938955dc76.zip | |
resolve conflicts w/4f174f1d27adbde6f50e11ee3a8eaf162a030284
Change-Id: I7ecce86e58af545aa18ea25e16978a1dce9dab8e
Diffstat (limited to 'src/com/android/launcher2/AppsCustomizeTabHost.java')
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizeTabHost.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java index 409affe17..27845bfac 100644 --- a/src/com/android/launcher2/AppsCustomizeTabHost.java +++ b/src/com/android/launcher2/AppsCustomizeTabHost.java @@ -74,7 +74,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona * reflects the new content (but doesn't do the animation and logic associated with changing * tabs manually). */ - private void setContentTypeImmediate(AppsCustomizePagedView.ContentType type) { + void setContentTypeImmediate(AppsCustomizePagedView.ContentType type) { onTabChangedStart(); onTabChangedEnd(type); } @@ -151,10 +151,11 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona if (contentWidth > 0 && mTabs.getLayoutParams().width != contentWidth) { // Set the width and show the tab bar mTabs.getLayoutParams().width = contentWidth; - post(mRelayoutAndMakeVisible); + mRelayoutAndMakeVisible.run(); } + + super.onMeasure(widthMeasureSpec, heightMeasureSpec); } - super.onMeasure(widthMeasureSpec, heightMeasureSpec); } public boolean onInterceptTouchEvent(MotionEvent ev) { |