Add data item to app info screen

Add link from app info to directly viewing data usage for that app.

Also do some minor tweaks to get ordering and summaries right on
the app info screen.

Bug: 19511439
Change-Id: Ic50dc24bf9a5c1fe6a7aa076772915ba61168fac
diff --git a/res/layout/app_header.xml b/res/layout/app_header.xml
index 8c3ca4b..d9453f4 100644
--- a/res/layout/app_header.xml
+++ b/res/layout/app_header.xml
@@ -36,7 +36,7 @@
         android:layout_alignWithParentIfMissing="true"
         android:layout_centerVertical="true"
         android:textAppearance="@style/TextAppearance.Switch"
-        android:textColor="?android:attr/textColorPrimary"
+        android:textColor="@android:color/white"
         android:textAlignment="viewStart" />
 
     <ImageView
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 441034c..f2edaca 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6040,11 +6040,17 @@
    <string name="launch_by_default">Launch by default</string>
 
    <!-- Summary for app storage preference [CHAR LIMIT=15] -->
-   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
-   <!-- Internal storage label [CHAR LIMIT=25] -->
-   <string name="storage_type_internal">internal memory</string>
-   <!-- External storage label [CHAR LIMIT=25] -->
-   <string name="storage_type_external">external memory</string>
+   <string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal storage">%2$s</xliff:g></string>
+
+   <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+   <string name="storage_type_internal">internal storage</string>
+   <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+   <string name="storage_type_external">external storage</string>
+
+   <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+   <string name="app_data_usage">App data usage</string>
+   <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+   <string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>
 
    <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
    <string name="notifications_enabled">On</string>
@@ -6068,4 +6074,7 @@
    <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
    <string name="launch_defaults_none">No defaults set</string>
 
+   <!-- Warning toast shown when data usage screen can't find specified app -->
+   <string name="unknown_app">Unknown app</string>
+
 </resources>
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
index 05bea5c..2f72f5d 100644
--- a/res/xml/installed_app_details.xml
+++ b/res/xml/installed_app_details.xml
@@ -21,13 +21,13 @@
         android:layout="@layout/installed_app_details" />
 
     <Preference
-        android:key="notification_settings"
-        android:title="@string/notification_section_header"
+        android:key="storage_settings"
+        android:title="@string/storage_settings"
         android:selectable="true" />
 
     <Preference
-        android:key="storage_settings"
-        android:title="@string/storage_settings"
+        android:key="data_settings"
+        android:title="@string/data_size_label"
         android:selectable="true" />
 
     <Preference
@@ -36,8 +36,8 @@
         android:selectable="true" />
 
     <Preference
-        android:key="data_settings"
-        android:title="@string/data_size_label"
+        android:key="notification_settings"
+        android:title="@string/notification_section_header"
         android:selectable="true" />
 
     <Preference