commit 831f6302eef195fadd5744bee3d8a262d3c364a0
author Fan Zhang <zhfan@google.com> Wed Nov 22 13:07:50 2017 -0800
committer Fan Zhang <zhfan@google.com> Wed Nov 22 14:44:23 2017 -0800
tree 350d3516f63bbd62498906594602e51263ceee04
parent 65ec66e3948ed1bd551e1cf744a260c5b252cb9e

Disable DevelopmentSettingsActivity by default

And if for any reason monkey user is able to enter develop option page,
we show nothing.

And update some test to sdk 26.

Change-Id: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes: 68707778
Test: robotests

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d031ed1..3ee67f7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1893,7 +1893,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" />
@@ -1962,15 +1963,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" />
@@ -1979,15 +1971,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"