diff options
| author | xoomdev <xoomdevnet@gmail.com> | 2013-08-23 19:31:04 -0500 |
|---|---|---|
| committer | xoomdev <xoomdevnet@gmail.com> | 2013-08-23 19:32:49 -0500 |
| commit | 78277dd14850580307e7efac65109bfa773bbf66 (patch) | |
| tree | 01ddd5a77ffc55d4092372df0499bc2d1316ba98 /src/com/cyanogenmod | |
| parent | 80c1c4d574d9ea002bd602ec93b5d2e5d8b2291a (diff) | |
| download | android_packages_apps_Trebuchet-78277dd14850580307e7efac65109bfa773bbf66.tar.gz android_packages_apps_Trebuchet-78277dd14850580307e7efac65109bfa773bbf66.tar.bz2 android_packages_apps_Trebuchet-78277dd14850580307e7efac65109bfa773bbf66.zip | |
Trebuchet: AppsCustomizePagedView: Update tab from content type
when not using joined apps view
Change-Id: I2dcc8cf61a3b0ac301acffa5369b535a5b59e835
Diffstat (limited to 'src/com/cyanogenmod')
| -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); } } } |