Merge "Revert "Support highlightable Settings homepage menu for 2-pane"" into... (d659a527) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −130

File changed.

Preview size limit exceeded, changes collapsed.

src/com/android/settings/Settings.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -83,7 +83,6 @@ public class Settings extends SettingsActivity {
		}

		public static class VpnSettingsActivity extends SettingsActivity { /* empty */ }
		/** Activity for Data saver settings. */
		public static class DataSaverSummaryActivity extends SettingsActivity{ /* empty */ }
		public static class DateTimeSettingsActivity extends SettingsActivity { /* empty */ }
		public static class PrivateVolumeForgetActivity extends SettingsActivity { /* empty */ }
		@@ -122,9 +121,13 @@ public class Settings extends SettingsActivity {
		public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }
		public static class AccessibilityContrastSettingsActivity extends SettingsActivity { /* empty */ }
		public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
		/** Activity for lockscreen settings. */
		/**
		* Activity for lockscreen settings.
		*/
		public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
		/** Activity for Reduce Bright Colors. */
		/**
		* Activity for Reduce Bright Colors.
		*/
		public static class ReduceBrightColorsSettingsActivity extends SettingsActivity { /* empty */ }
		/** Activity for the security dashboard. */
		public static class SecurityDashboardActivity extends SettingsActivity {

src/com/android/settings/SettingsActivity.java

+10 −15

Original line number	Diff line number	Diff line
		@@ -149,13 +149,9 @@ public class SettingsActivity extends SettingsBaseActivity
		public static final String META_DATA_KEY_FRAGMENT_CLASS =
		"com.android.settings.FRAGMENT_CLASS";

		public static final String META_DATA_KEY_HIGHLIGHT_MENU_KEY =
		"com.android.settings.HIGHLIGHT_MENU_KEY";

		private static final String EXTRA_UI_OPTIONS = "settings:ui_options";

		private String mFragmentClass;
		private String mHighlightMenuKey;

		private CharSequence mInitialTitle;
		private int mInitialTitleResId;
		@@ -238,19 +234,21 @@ public class SettingsActivity extends SettingsBaseActivity
		super.onCreate(savedState);
		Log.d(LOG_TAG, "Starting onCreate");

		long startTime = System.currentTimeMillis();

		// Should happen before any call to getIntent()
		getMetaData();
		final Intent intent = getIntent();
		if (launchHomepageForTwoPaneDeepLink(intent)) {
		if (launchHomepageForTwonPaneDeepLink()) {
		finish();
		return;
		}

		long startTime = System.currentTimeMillis();

		final FeatureFactory factory = FeatureFactory.getFactory(this);

		mDashboardFeatureProvider = factory.getDashboardFeatureProvider(this);

		// Should happen before any call to getIntent()
		getMetaData();

		final Intent intent = getIntent();
		if (intent.hasExtra(EXTRA_UI_OPTIONS)) {
		getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
		}
		@@ -357,7 +355,8 @@ public class SettingsActivity extends SettingsBaseActivity
		}

		/** Returns true if the Activity is started by a deep link intent for large screen devices. */
		private boolean launchHomepageForTwoPaneDeepLink(Intent intent) {
		private boolean launchHomepageForTwonPaneDeepLink() {
		final Intent intent = getIntent();
		if (!shouldShowTwoPaneDeepLink(intent)) {
		return false;
		}
		@@ -369,9 +368,6 @@ public class SettingsActivity extends SettingsBaseActivity
		trampolineIntent.putExtra(
		android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_URI,
		intent.toUri(Intent.URI_INTENT_SCHEME));
		trampolineIntent.putExtra(
		android.provider.Settings.EXTRA_SETTINGS_LARGE_SCREEN_HIGHLIGHT_MENU_KEY,
		mHighlightMenuKey);
		trampolineIntent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
		startActivity(trampolineIntent);

		@@ -780,7 +776,6 @@ public class SettingsActivity extends SettingsBaseActivity
		PackageManager.GET_META_DATA);
		if (ai == null \|\| ai.metaData == null) return;
		mFragmentClass = ai.metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
		mHighlightMenuKey = ai.metaData.getString(META_DATA_KEY_HIGHLIGHT_MENU_KEY);
		} catch (NameNotFoundException nnfe) {
		// No recovery
		Log.d(LOG_TAG, "Cannot get Metadata for: " + getComponentName().toString());

src/com/android/settings/SettingsPreferenceFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,8 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF

		@VisibleForTesting
		public HighlightablePreferenceGroupAdapter mAdapter;
		private boolean mPreferenceHighlighted = false;
		@VisibleForTesting
		public boolean mPreferenceHighlighted = false;

		@Override
		public void onCreate(Bundle icicle) {

src/com/android/settings/Utils.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -1223,14 +1223,6 @@ public final class Utils extends com.android.settingslib.Utils {
		return getColorAttrDefaultColor(context, android.R.attr.textColorSecondary);
		}

		/**
		* Returns the highlight color of homepage preference icons.
		*/
		@ColorInt
		public static int getHomepageIconColorHighlight(Context context) {
		return getColorAttrDefaultColor(context, android.R.attr.textColorSecondaryInverse);
		}

		public static boolean isProviderModelEnabled(Context context) {
		return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
		}