Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8d0d19 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add PrivacySettings to System category. 

This activity is only activated when useDefaultBackup flag is set in
SettingsActivity

Bug: 31801428
Test: RunSettingsRoboTests
Change-Id: I7f5e968684dea623fb5604f944472accb89a0176
parent 44a9f127

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -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">

src/com/android/settings/SettingsActivity.java

+4 −0
Original line number Diff line number Diff line
@@ -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 {