diff options
Diffstat (limited to 'src/com/android/settings/SettingsActivity.java')
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 5b7895053..9bd8d4c6c 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -325,7 +325,9 @@ public class SettingsActivity extends Activity public void handleMessage(Message msg) { switch (msg.what) { case MSG_BUILD_CATEGORIES: { - buildDashboardCategories(mCategories); + if(mNeedToRebuildCategories) { + buildDashboardCategories(mCategories); + } } break; } } @@ -342,7 +344,7 @@ public class SettingsActivity extends Activity } public List<DashboardCategory> getDashboardCategories() { - if (mNeedToRebuildCategories) { + if (mNeedToRebuildCategories || mCategories.size() == 0) { buildDashboardCategories(mCategories); mNeedToRebuildCategories = false; } @@ -491,16 +493,11 @@ public class SettingsActivity extends Activity switchToFragment( initialFragmentName, initialArguments, true, false, mInitialTitle, false); } else { - // We need to build the Categories in all cases - buildDashboardCategories(mCategories); - // No UP if we are displaying the main Dashboard mDisplayHomeAsUpEnabled = false; - if (mCategories.size() > 0) { - mInitialTitle = getText(R.string.dashboard_title); - switchToFragment(DashboardSummary.class.getName(), null, false, false, - mInitialTitle, false); - } + mInitialTitle = getText(R.string.dashboard_title); + switchToFragment(DashboardSummary.class.getName(), null, false, false, + mInitialTitle, false); } } |