commit 9f629d69804be3e50423e4292858005ad29c6761
author Salvador Martinez <dehboxturtle@google.com> Thu Apr 20 15:45:19 2017 -0700
committer Salvador Martinez <dehboxturtle@google.com> Thu Apr 27 15:13:33 2017 -0700
tree bdf9557fe42797e11b1aa6bcf9861f22af9ed5c2
parent 4380a8fd7c3b6ddd31e80283c3e45050ed0fd954

Add ability to switch between support versions

Creates a trampoline activity and adds functionality
to the SupportFeatureProvider interface so that we can
conditionally launch support V1 or V2.

Test: Test in ag/2144016
Bug: 37306241
Change-Id: I6d24e65cad91692e457ea216713e90239845b4f5

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 66068eb..d58adfd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2957,6 +2957,11 @@
                        android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" />
         </activity>
 
+        <activity android:name="Settings$LegacySupportActivity">
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+            android:value="com.android.settings.dashboard.SupportFragment"/>
+        </activity>
+
         <!-- Information architecture host activities -->
 
         <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
@@ -3006,17 +3011,16 @@
                        android:resource="@string/system_dashboard_summary"/>
         </activity>
 
-        <activity android:name=".Settings$SupportDashboardActivity"
+        <activity android:name=".dashboard.SupportDashboardActivity"
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_help"
+                  android:theme="@android:style/Theme.NoDisplay"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter android:priority="-2">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <meta-data android:name="com.android.settings.category"
                        android:value="com.android.settings.category.ia.homepage"/>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.dashboard.SupportFragment"/>
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/support_summary"/>
         </activity>