commit bb6d2608e9f07134107fcb0a2243ed45f92970f8
author Fan Zhang <zhfan@google.com> Tue Oct 04 13:21:06 2016 -0700
committer Fan Zhang <zhfan@google.com> Tue Oct 04 14:06:57 2016 -0700
tree 201e86c6857e58aec1271a2e33420be42c543c2c
parent 27991718e587e9665696953fe940e1abb3f5a776

Add storage dashborad page.

Refactor shared dashboard page display logic between storage and
system page.

Bug: 31800690
Test: RunSettingsRoboTests

Change-Id: I7eb86f590b79ab871bdb383fb2f5326790beb193

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0927435..e5e9ecb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3035,7 +3035,7 @@
         <!-- Alias for battery settings in new IA. Remove and merge metadata into TargetActivity -->
         <activity-alias android:name="BatteryDashboardAlias"
                         android:targetActivity="Settings$PowerUsageSummaryActivity">
-            <intent-filter android:priority="10">
+            <intent-filter android:priority="7">
                 <action android:name="com.android.settings.action.SETTINGS"/>
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -3044,6 +3044,34 @@
                        android:value="com.android.settings.category.ia.homepage"/>
         </activity-alias>
 
+        <activity android:name=".Settings$StorageDashboardActivity"
+                  android:label="@string/storage_settings"
+                  android:icon="@drawable/ic_settings_storage">
+            <intent-filter android:priority="5">
+                <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.deviceinfo.StorageDashboardFragment" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
+        <activity-alias android:name="InternalStorageDashboardAlias"
+                        android:targetActivity="Settings$StorageSettingsActivity"
+                        android:label="@string/storage_internal_title">
+            <intent-filter android:priority="5">
+                <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.storage" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.deviceinfo.StorageSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity-alias>
+
         <activity android:name=".Settings$SystemDashboardActivity"
                   android:label="@string/header_category_system"
                   android:icon="@drawable/ic_settings_about">