Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow to open Content Protection settings externally" into main

Browse Source
This commit is contained in:
Yuri Ufimtsev
2025-01-07 00:58:53 -08:00
committed by Android (Google) Code Review
parent 60e13c7928 3eff731e52
commit 5716bd85f9
4 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -528,4 +528,5 @@ public class Settings extends SettingsActivity {
public static class HearingDevicesActivity extends SettingsActivity { /* empty */ }
public static class HearingDevicesPairingActivity extends SettingsActivity { /* empty */ }
public static class ContactsStorageSettingsActivity extends SettingsActivity { /* empty */ }
public static class ContentProtectionSettingsActivity extends SettingsActivity { /* empty */ }
}

4
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -189,6 +189,7 @@ import com.android.settings.regionalpreferences.RegionPickerFragment;
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
import com.android.settings.regionalpreferences.TemperatureUnitFragment;
import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
import com.android.settings.security.ContentProtectionPreferenceFragment;
import com.android.settings.security.LockscreenDashboardFragment;
import com.android.settings.security.MemtagPage;
import com.android.settings.security.SecurityAdvancedSettings;
@@ -415,7 +416,8 @@ public class SettingsGateway {
HearingDevicePairingFragment.class.getName(),
ZenModesListFragment.class.getName(),
ZenModeFragment.class.getName(),
ContactsStorageSettings.class.getName()
ContactsStorageSettings.class.getName(),
ContentProtectionPreferenceFragment.class.getName(),
};
public static final String[] SETTINGS_FOR_RESTRICTED = {