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

Merge "Add PrivacySettings to System category."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-02 23:06:02 +00:00
committed by Android (Google) Code Review
parent 5944768fbe 0e8d0d19af
commit 6478c51c1e
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AndroidManifest.xml
View File

@@ -3244,6 +3244,19 @@
android:resource="@string/gesture_preference_summary"/>
</activity-alias>
<activity-alias android:name="PrivacyDashboardAlias"
android:targetActivity="Settings$PrivacySettingsActivity">
<intent-filter android:priority="60">
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.PrivacySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity-alias>
<activity-alias android:name="BackupResetDashboardAlias"
android:targetActivity="Settings$PrivacySettingsActivity">
<intent-filter android:priority="60">

4
src/com/android/settings/SettingsActivity.java
View File

@@ -1189,6 +1189,10 @@ public class SettingsActivity extends SettingsDrawerActivity
boolean useDefaultBackup = TextUtils.isEmpty(backupIntent);
setTileEnabled(new ComponentName(packageName,
Settings.PrivacySettingsActivity.class.getName()), useDefaultBackup, isAdmin, pm);
setTileEnabled(new ComponentName(packageName,
"com.android.settings.PrivacyDashboardAlias"),
useDefaultBackup, isAdmin, pm);
boolean hasBackupActivity = false;
if (!useDefaultBackup) {
try {