commit 7373ec042b98a3152bce8c627067f25541eb82b4
author Fan Zhang <zhfan@google.com> Tue Aug 14 13:25:47 2018 -0700
committer Fan Zhang <zhfan@google.com> Wed Aug 15 09:48:38 2018 -0700
tree ab29755f4d2bdfbfb68f7e13f51f278b09af8711
parent 5d4bedb7d2593bc7d14b421a2ac25731735bc772

Migrate all remaining condition cards to v2.

Bug: 112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d435731..9a771ac 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1892,7 +1892,8 @@
             android:name=".development.DevelopmentSettingsDisabledActivity"
             android:icon="@drawable/ic_settings_development"
             android:label="@string/development_settings_title"
-            android:theme="@android:style/Theme.NoDisplay">
+            android:excludeFromRecents="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" />
@@ -3069,10 +3070,12 @@
             </intent-filter>
         </service>
 
-        <activity android:name=".HelpTrampoline"
+        <activity
+            android:name=".HelpTrampoline"
             android:exported="true"
-            android:theme="@android:style/Theme.NoDisplay"
+            android:theme="@style/Transparent"
             android:permission="android.permission.DUMP"
+            android:excludeFromRecents="true"
             android:enabled="@bool/config_has_help" />
 
         <activity android:name=".applications.autofill.AutofillPickerActivity"