Merge "Move android.settings.PRIVACY_SETTINGS to PrivacySettings."

This commit is contained in:
TreeHugger Robot
2019-02-06 03:20:35 +00:00
committed by Android (Google) Code Review

View File

@@ -1235,6 +1235,10 @@
android:icon="@drawable/ic_settings_backup"
android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.settings.PRIVACY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2792,10 +2796,6 @@
<activity android:name=".backup.UserBackupSettingsActivity"
android:label="@string/privacy_settings_title"
android:icon="@drawable/ic_settings_backup">
<intent-filter android:priority="1">
<action android:name="android.settings.PRIVACY_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />