Snap for 9238644 from b0f38d29d2c133313da2e758f09976f16e795b6f to tm-qpr2-release (89ae3596) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1744,6 +1744,8 @@
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.security.SecurityAdvancedSettings" />
		<meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"
		android:value="@string/menu_key_security"/>
		</activity>

		<activity android:name="MonitoringCertInfoActivity"

src/com/android/settings/TetherSettings.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;
		import static android.net.ConnectivityManager.TETHERING_USB;
		import static android.net.TetheringManager.TETHERING_ETHERNET;

		import static com.android.settings.wifi.WifiUtils.canShowWifiHotspot;
		import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfUsbDataSignalingIsDisabled;

		import android.app.Activity;
		@@ -589,6 +590,9 @@ public class TetherSettings extends RestrictedSettingsFragment

		if (!TetherUtil.isTetherAvailable(context)) {
		keys.add(KEY_TETHER_PREFS_SCREEN);
		}

		if (!canShowWifiHotspot(context) \|\| !TetherUtil.isTetherAvailable(context)) {
		keys.add(KEY_WIFI_TETHER);
		}

src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -153,8 +153,11 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
		controlUri = null;
		}
		}
		use(SlicePreferenceController.class).setSliceUri(sliceEnabled ? controlUri : null);
		use(SlicePreferenceController.class).onStart();
		final SlicePreferenceController slicePreferenceController = use(
		SlicePreferenceController.class);
		slicePreferenceController.setSliceUri(sliceEnabled ? controlUri : null);
		slicePreferenceController.onStart();
		slicePreferenceController.displayPreference(getPreferenceScreen());
		}

		private final ViewTreeObserver.OnGlobalLayoutListener mOnGlobalLayoutListener =

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

+18 −1

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ import com.android.settings.core.CategoryMixin;
		import com.android.settings.core.FeatureFlags;
		import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
		import com.android.settings.overlay.FeatureFactory;
		import com.android.settings.safetycenter.SafetyCenterManagerWrapper;
		import com.android.settingslib.Utils;
		import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;

		@@ -479,12 +480,28 @@ public class SettingsHomepageActivity extends FragmentActivity implements
		final String menuKey = intent.getStringExtra(
		EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY);
		if (!TextUtils.isEmpty(menuKey)) {
		return menuKey;
		return maybeRemapMenuKey(menuKey);
		}
		}
		return getString(DEFAULT_HIGHLIGHT_MENU_KEY);
		}

		private String maybeRemapMenuKey(String menuKey) {
		boolean isPrivacyOrSecurityMenuKey =
		getString(R.string.menu_key_privacy).equals(menuKey)
		\|\| getString(R.string.menu_key_security).equals(menuKey);
		boolean isSafetyCenterMenuKey = getString(R.string.menu_key_safety_center).equals(menuKey);

		if (isPrivacyOrSecurityMenuKey && SafetyCenterManagerWrapper.get().isEnabled(this)) {
		return getString(R.string.menu_key_safety_center);
		}
		if (isSafetyCenterMenuKey && !SafetyCenterManagerWrapper.get().isEnabled(this)) {
		// We don't know if security or privacy, default to security as it is above.
		return getString(R.string.menu_key_security);
		}
		return menuKey;
		}

		private void reloadHighlightMenuKey() {
		mMainFragment.getArguments().putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY,
		getHighlightMenuKey());

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.settings.core.FeatureFlags;
		import com.android.settings.dashboard.RestrictedDashboardFragment;
		import com.android.settings.search.BaseSearchIndexProvider;
		import com.android.settings.widget.SettingsMainSwitchBar;
		import com.android.settings.wifi.WifiUtils;
		import com.android.settingslib.TetherUtil;
		import com.android.settingslib.core.AbstractPreferenceController;
		import com.android.settingslib.search.SearchIndexable;
		@@ -292,12 +293,12 @@ public class WifiTetherSettings extends RestrictedDashboardFragment

		@Override
		protected boolean isPageSearchEnabled(Context context) {
		if (context == null \|\| !WifiUtils.canShowWifiHotspot(context)) return false;
		return !FeatureFlagUtils.isEnabled(context, FeatureFlags.TETHER_ALL_IN_ONE);
		}

		@Override
		public List<AbstractPreferenceController> createPreferenceControllers(
		Context context) {
		public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
		return buildPreferenceControllers(context, null /* listener */);
		}
		}