PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct menu key highlights for safety center" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-31 10:04:02 +00:00
committed by Android (Google) Code Review
parent 3cb39ca221 ea8a4adc91
commit b0f38d29d2
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -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"

19
src/com/android/settings/homepage/SettingsHomepageActivity.java
View File

@@ -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());