Merge "Fix the highlight error and remove the empty card" into sc-v2-dev (e06fb634) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/homepage/SettingsHomepageActivity.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}
		mHomepageView = null;

		mLoadedListeners.forEach(listener -> listener.onHomepageLoaded());

+6 −3

Original line number	Diff line number	Diff line
		@@ -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() {
		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.
		if (!ActivityEmbeddingUtils.isTwoPaneResolution(getActivity())) {
		setHighlightMenuKey(getString(SettingsHomepageActivity.DEFAULT_HIGHLIGHT_MENU_KEY),
		/* scrollNeeded= */ false);
		}