commit 98998a2fcc80f1dfc9259d1a095c69d537fe7dfa
author Eric Schwarzenbach <easchwar@google.com> Tue Feb 06 15:57:01 2018 -0800
committer Eric Schwarzenbach <easchwar@google.com> Wed Feb 07 14:29:41 2018 -0800
tree be72fdc8046945008f8fc73dce5ae72bdbb8fc0f
parent f504294b12fd99ee111faf91ebc3d446c9c71568

Add feature flag for new DataUsageSummary fragment.

Creates a new fragment DataUsageSummaryLegacy, which is used
instead of DataUsageSummary when the feature flag is off (default
behavior).

Copies the current DataUsageSummary.java, data_usage.xml, and
DataUsageSummaryActivity to create the legacy versions. This
change allows for uninterupted development of new features in the
DataUsageSummary fragment.

Test: manual
Test: make RunSettingsRoboTests
Bug: 70950124
Change-Id: I9d79e108bbfc1c8ec620f86c0183f4ed3f41c9d7

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c526d6f..5867422 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2404,7 +2404,21 @@
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
                 android:icon="@drawable/ic_settings_data_usage"
-                android:taskAffinity="">
+                android:enabled="false">
+            <!-- TODO(b/70950124): add shortcut intent-filter -->
+            <intent-filter android:priority="10">
+                <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.wireless" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.datausage.DataUsageSummary" />
+        </activity>
+
+        <activity android:name="Settings$DataUsageSummaryLegacyActivity"
+                  android:label="@string/data_usage_summary_title"
+                  android:icon="@drawable/ic_settings_data_usage"
+                  android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -2414,9 +2428,9 @@
                 <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.wireless" />
+                       android:value="com.android.settings.category.ia.wireless" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                android:value="com.android.settings.datausage.DataUsageSummary" />
+                       android:value="com.android.settings.datausage.DataUsageSummaryLegacy" />
         </activity>
 
         <activity android:name="Settings$MobileDataUsageListActivity"