diff options
author | Michael Jurka <mikejurka@google.com> | 2011-05-17 18:21:03 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-05-20 15:10:10 -0700 |
commit | ea2daffe8f950f2166f0a07d498e84e33a964252 (patch) | |
tree | 485feb761662a927dcf2670f1c3554e19ad63b12 /src/com/android/launcher2/CustomizeTrayTabHost.java | |
parent | 38d1b0b3520243505a4a1469b5730e0b9c7e24ce (diff) | |
download | android_packages_apps_Trebuchet-ea2daffe8f950f2166f0a07d498e84e33a964252.tar.gz android_packages_apps_Trebuchet-ea2daffe8f950f2166f0a07d498e84e33a964252.tar.bz2 android_packages_apps_Trebuchet-ea2daffe8f950f2166f0a07d498e84e33a964252.zip |
Allow determining # of rows/columns for All Apps and Customize at run time
DO NOT MERGE
Change-Id: I9ba0add8f2b2ffb324468768ad058c8426db6894
Diffstat (limited to 'src/com/android/launcher2/CustomizeTrayTabHost.java')
-rw-r--r-- | src/com/android/launcher2/CustomizeTrayTabHost.java | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/com/android/launcher2/CustomizeTrayTabHost.java b/src/com/android/launcher2/CustomizeTrayTabHost.java index 3e0402509..765c41dd2 100644 --- a/src/com/android/launcher2/CustomizeTrayTabHost.java +++ b/src/com/android/launcher2/CustomizeTrayTabHost.java @@ -110,17 +110,6 @@ public class CustomizeTrayTabHost extends TabHost implements LauncherTransitiona } } }); - - // Set the width of the tab bar properly - int pageWidth = customizePagedView.getPageContentWidth(); - TabWidget customizeTabBar = (TabWidget) findViewById(com.android.internal.R.id.tabs); - if (customizeTabBar == null) throw new Resources.NotFoundException(); - int tabWidgetPadding = 0; - final int childCount = tabWidget.getChildCount(); - if (childCount > 0) { - tabWidgetPadding += tabWidget.getChildAt(0).getPaddingLeft() * 2; - } - customizeTabBar.getLayoutParams().width = pageWidth + tabWidgetPadding; } @Override @@ -145,7 +134,23 @@ public class CustomizeTrayTabHost extends TabHost implements LauncherTransitiona @Override protected void onLayout(boolean changed, int l, int t, int r, int b) { - mFirstLayout = false; + if (mFirstLayout) { + mFirstLayout = false; + + final CustomizePagedView customizePagedView = + (CustomizePagedView) findViewById(R.id.customization_drawer_tab_contents); + TabWidget tabWidget = (TabWidget) findViewById(com.android.internal.R.id.tabs); + // Set the width of the tab bar properly + int pageWidth = customizePagedView.getPageContentWidth(); + TabWidget customizeTabBar = (TabWidget) findViewById(com.android.internal.R.id.tabs); + if (customizeTabBar == null) throw new Resources.NotFoundException(); + int tabWidgetPadding = 0; + final int childCount = tabWidget.getChildCount(); + if (childCount > 0) { + tabWidgetPadding += tabWidget.getChildAt(0).getPaddingLeft() * 2; + } + customizeTabBar.getLayoutParams().width = pageWidth + tabWidgetPadding; + } super.onLayout(changed, l, t, r, b); } |