am 59fe4f10: am 8e1b4f65: am fa4086dd: Fixing issue where selected tab did not match AllApps page upon rotation.

* commit '59fe4f1023267f48cd89b132f2c5d6741028bbaf':
  Fixing issue where selected tab did not match AllApps page upon rotation.
This commit is contained in:
Winson Chung authored and Android Git Automerger committed 2012-07-25 23:05:33 -07:00
commit 281bcdb98d
1 file changed
+5 -8
@@ -48,7 +48,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
private ViewGroup mTabs;
private ViewGroup mTabsContainer;
private AppsCustomizePagedView mAppsCustomizePane;
private boolean mSuppressContentCallback = false;
private FrameLayout mAnimationBuffer;
private LinearLayout mContent;
@@ -75,16 +74,17 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
* tabs manually).
*/
void setContentTypeImmediate(AppsCustomizePagedView.ContentType type) {
setOnTabChangedListener(null);
onTabChangedStart();
onTabChangedEnd(type);
setCurrentTabByTag(getTabTagForContentType(type));
setOnTabChangedListener(this);
}
void selectAppsTab() {
setContentTypeImmediate(AppsCustomizePagedView.ContentType.Applications);
setCurrentTabByTag(APPS_TAB_TAG);
}
void selectWidgetsTab() {
setContentTypeImmediate(AppsCustomizePagedView.ContentType.Widgets);
setCurrentTabByTag(WIDGETS_TAB_TAG);
}
/**
@@ -201,10 +201,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
@Override
public void onTabChanged(String tabId) {
final AppsCustomizePagedView.ContentType type = getContentTypeForTabTag(tabId);
if (mSuppressContentCallback) {
mSuppressContentCallback = false;
return;
}
// Animate the changing of the tab content by fading pages in and out
final Resources res = getResources();
@@ -295,8 +291,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
}
public void setCurrentTabFromContent(AppsCustomizePagedView.ContentType type) {
mSuppressContentCallback = true;
setOnTabChangedListener(null);
setCurrentTabByTag(getTabTagForContentType(type));
setOnTabChangedListener(this);
}
/**