PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '59fe4f1023267f48cd89b132f2c5d6741028bbaf':
  Fixing issue where selected tab did not match AllApps page upon rotation.
This commit is contained in:
Winson Chung
2012-07-25 23:05:33 -07:00
committed by Android Git Automerger
parent 80e055ee81 59fe4f1023
commit 281bcdb98d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/AppsCustomizeTabHost.java
+5 -8
View File
@@ -48,7 +48,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
private ViewGroup mTabs; private ViewGroup mTabs;
private ViewGroup mTabsContainer; private ViewGroup mTabsContainer;
private AppsCustomizePagedView mAppsCustomizePane; private AppsCustomizePagedView mAppsCustomizePane;
private boolean mSuppressContentCallback = false;
private FrameLayout mAnimationBuffer; private FrameLayout mAnimationBuffer;
private LinearLayout mContent; private LinearLayout mContent;
@@ -75,16 +74,17 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
* tabs manually). * tabs manually).
*/ */
void setContentTypeImmediate(AppsCustomizePagedView.ContentType type) { void setContentTypeImmediate(AppsCustomizePagedView.ContentType type) {
setOnTabChangedListener(null);
onTabChangedStart(); onTabChangedStart();
onTabChangedEnd(type); onTabChangedEnd(type);
setCurrentTabByTag(getTabTagForContentType(type));
setOnTabChangedListener(this);
} }
void selectAppsTab() { void selectAppsTab() {
setContentTypeImmediate(AppsCustomizePagedView.ContentType.Applications); setContentTypeImmediate(AppsCustomizePagedView.ContentType.Applications);
setCurrentTabByTag(APPS_TAB_TAG);
} }
void selectWidgetsTab() { void selectWidgetsTab() {
setContentTypeImmediate(AppsCustomizePagedView.ContentType.Widgets); setContentTypeImmediate(AppsCustomizePagedView.ContentType.Widgets);
setCurrentTabByTag(WIDGETS_TAB_TAG);
} }
/** /**
@@ -201,10 +201,6 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
@Override @Override
public void onTabChanged(String tabId) { public void onTabChanged(String tabId) {
final AppsCustomizePagedView.ContentType type = getContentTypeForTabTag(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 // Animate the changing of the tab content by fading pages in and out
final Resources res = getResources(); final Resources res = getResources();
@@ -295,8 +291,9 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
} }
public void setCurrentTabFromContent(AppsCustomizePagedView.ContentType type) { public void setCurrentTabFromContent(AppsCustomizePagedView.ContentType type) {
mSuppressContentCallback = true; setOnTabChangedListener(null);
setCurrentTabByTag(getTabTagForContentType(type)); setCurrentTabByTag(getTabTagForContentType(type));
setOnTabChangedListener(this);
} }
/** /**