From 8c559c2788b4a40f23fc33b9ede7c2d326704d5c Mon Sep 17 00:00:00 2001 From: Jason Chiu Date: Thu, 9 Dec 2021 15:09:09 +0800 Subject: [PATCH] Fix the highlight error and remove the empty card Fix: 209918251 Test: manual Change-Id: I2a5afceea18cd4e1009114091433a2da22ac105e --- .../settings/homepage/SettingsHomepageActivity.java | 7 ++----- src/com/android/settings/homepage/TopLevelSettings.java | 9 ++++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java index d5e82353bd3..9076053ff65 100644 --- a/src/com/android/settings/homepage/SettingsHomepageActivity.java +++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java @@ -125,11 +125,8 @@ public class SettingsHomepageActivity extends FragmentActivity implements } Log.i(TAG, "showHomepageWithSuggestion: " + showSuggestion); final View homepageView = mHomepageView; - if (!mIsTwoPaneLastTime) { - mSuggestionView.setVisibility(showSuggestion ? View.VISIBLE : View.GONE); - } else { - mTwoPaneSuggestionView.setVisibility(showSuggestion ? View.VISIBLE : View.GONE); - } + mSuggestionView.setVisibility(showSuggestion ? View.VISIBLE : View.GONE); + mTwoPaneSuggestionView.setVisibility(showSuggestion ? View.VISIBLE : View.GONE); mHomepageView = null; mLoadedListeners.forEach(listener -> listener.onHomepageLoaded()); diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java index 2bb8e34b408..f2e5a3528f7 100644 --- a/src/com/android/settings/homepage/TopLevelSettings.java +++ b/src/com/android/settings/homepage/TopLevelSettings.java @@ -54,6 +54,7 @@ public class TopLevelSettings extends DashboardFragment implements private static final String PREF_KEY_SUPPORT = "top_level_support"; private TopLevelHighlightMixin mHighlightMixin; + private boolean mFirstStarted = true; public TopLevelSettings() { final Bundle args = new Bundle(); @@ -135,9 +136,11 @@ public class TopLevelSettings extends DashboardFragment implements @Override public void onStart() { - // Set default highlight menu key for 1-pane homepage since it will show the placeholder - // page once changing back to 2-pane. - if (!ActivityEmbeddingUtils.isTwoPaneResolution(getActivity())) { + if (mFirstStarted) { + mFirstStarted = false; + } else if (!ActivityEmbeddingUtils.isTwoPaneResolution(getActivity())) { + // Set default highlight menu key for 1-pane homepage since it will show the placeholder + // page once changing back to 2-pane. setHighlightMenuKey(getString(SettingsHomepageActivity.DEFAULT_HIGHLIGHT_MENU_KEY), /* scrollNeeded= */ false); }