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

Merge "Disable DevelopmentSettingsActivity by default"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-11-23 01:47:53 +00:00
committed by Android (Google) Code Review
parent e2e0ee33f5 831f6302ee
commit 03b2d4c44c
20 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
AndroidManifest.xml
View File

@@ -1920,7 +1920,8 @@
android:label="@string/development_settings_title"
android:icon="@drawable/ic_settings_development"
android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
android:parentActivityName="Settings"
android:enabled="false">
<intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1989,15 +1990,6 @@
android:value="com.android.settings.print.PrintJobSettingsFragment" />
</activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DevelopmentSettings"
android:exported="true"
android:label="@string/development_settings_title"
android:targetActivity="Settings$DevelopmentSettingsDashboardActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />
</activity-alias>
<activity android:name=".development.AppPicker"
android:label="@string/select_application"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog" />
@@ -2006,15 +1998,6 @@
android:label="@string/select_webview_provider_dialog_title">
</activity>
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UsbSettings"
android:exported="true"
android:label="@string/storage_title_usb"
android:targetActivity="Settings$DevelopmentSettingsDashboardActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.UsbSettings" />
</activity-alias>
<!-- Bluetooth stuff -->
<activity android:name=".bluetooth.BluetoothPairingDialog"