diff options
| author | Danesh M <daneshm90@gmail.com> | 2013-08-30 18:41:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-08-30 18:41:35 +0000 |
| commit | d5736629fff6b62d60ac267fe1d0fccefaa239ed (patch) | |
| tree | f4050fd81fdad18a7e44b63e9c5afa6677318a79 /src | |
| parent | 7ff62854bc049537aa3792e8518637815ce6189e (diff) | |
| parent | 78277dd14850580307e7efac65109bfa773bbf66 (diff) | |
| download | android_packages_apps_Trebuchet-d5736629fff6b62d60ac267fe1d0fccefaa239ed.tar.gz android_packages_apps_Trebuchet-d5736629fff6b62d60ac267fe1d0fccefaa239ed.tar.bz2 android_packages_apps_Trebuchet-d5736629fff6b62d60ac267fe1d0fccefaa239ed.zip | |
Merge "Trebuchet: AppsCustomizePagedView: Update tab from content type when not using joined apps view" into cm-10.2
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java index 9ca1882ab..5505855be 100755 --- a/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java +++ b/src/com/cyanogenmod/trebuchet/AppsCustomizePagedView.java @@ -1127,15 +1127,19 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen private void updateCurrentTab(int currentPage) { AppsCustomizeTabHost tabHost = getTabHost(); if (tabHost != null) { - String tag = tabHost.getCurrentTabTag(); - if (tag != null) { - if (currentPage >= mNumAppsPages && - !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) { - tabHost.setCurrentTabFromContent(ContentType.Widgets); - } else if (currentPage < mNumAppsPages && - !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) { - tabHost.setCurrentTabFromContent(ContentType.Applications); + if (mJoinWidgetsApps) { + String tag = tabHost.getCurrentTabTag(); + if (tag != null) { + if (currentPage >= mNumAppsPages && + !tag.equals(tabHost.getTabTagForContentType(ContentType.Widgets))) { + tabHost.setCurrentTabFromContent(ContentType.Widgets); + } else if (currentPage < mNumAppsPages && + !tag.equals(tabHost.getTabTagForContentType(ContentType.Applications))) { + tabHost.setCurrentTabFromContent(ContentType.Applications); + } } + } else { + tabHost.setCurrentTabFromContent(mContentType); } } } |