diff options
| author | Chaohui Wang <chaohuiw@google.com> | 2023-11-27 06:49:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-27 06:49:55 +0000 |
| commit | 357076d03d364ec177836ea6152114825ad9aa55 (patch) | |
| tree | 86a2e52b738090c078d607ea2cfb242fbdee44ae /AndroidManifest.xml | |
| parent | 30c8254cfdb883b83986405dc234d8541ebc9262 (diff) | |
| parent | ee7139a889cb96aab74ca0ad263ec25958efd430 (diff) | |
| download | Settings-357076d03d364ec177836ea6152114825ad9aa55.tar.gz | |
Merge "Remove injecting developer options into Settings itself" into main
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 1e46fdfe170..8ec5b3d405b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2864,11 +2864,10 @@ </activity> <activity - android:name="Settings$DevelopmentSettingsDashboardActivity" + android:name="Settings$DevelopmentSettingsActivity" android:label="@string/development_settings_title" android:icon="@drawable/ic_settings_development" - android:exported="true" - android:enabled="false"> + android:exported="true"> <intent-filter android:priority="1"> <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> @@ -2879,35 +2878,8 @@ <action android:name="com.android.settings.action.SETTINGS" /> <action android:name="com.android.intent.action.SHOW_CONTRAST_DIALOG" /> </intent-filter> - <meta-data android:name="com.android.settings.order" android:value="-40"/> - <meta-data android:name="com.android.settings.category" - android:value="com.android.settings.category.ia.system" /> - <meta-data android:name="com.android.settings.summary" - android:resource="@string/summary_empty"/> - <meta-data android:name="com.android.settings.icon" - android:resource="@drawable/ic_settings_development" /> <meta-data android:name="com.android.settings.FRAGMENT_CLASS" android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" /> - <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY" - android:value="@string/menu_key_system"/> - <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED" - android:value="true" /> - </activity> - - <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real - activity is disabled to be CTS compliant. --> - <activity - android:name=".development.DevelopmentSettingsDisabledActivity" - android:icon="@drawable/ic_settings_development" - android:label="@string/development_settings_title" - android:excludeFromRecents="true" - android:exported="true" - android:theme="@style/Transparent"> - <intent-filter android:priority="-1"> - <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> - <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - </intent-filter> </activity> <activity |