From 3fc34b65dc9f29e0015ae0281a4e5575a0a2bced Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Tue, 7 Feb 2017 14:27:59 -0800
Subject: [PATCH] Update App Info page layout.

- Update the header view layout to move the app icon to the left.
- Re-order the preference items on the page: Notifications,
  Permissions, Storage, Data usage, Battery, Default

Change-Id: I936df7ed8305c0b5deae8b1d812e05833c2b7f11
Bug: 34977561
Test: Visual
---
 res/layout/app_details.xml           | 70 ++++++++++++++++++----------
 res/xml/installed_app_details_ia.xml | 24 +++++-----
 2 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml
index 7994a4c009b..9f349deaffc 100644
--- a/res/layout/app_details.xml
+++ b/res/layout/app_details.xml
@@ -24,36 +24,56 @@
     android:layout_gravity="center_horizontal|top"
     android:orientation="vertical"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp" >
 
     <!-- App snippet with buttons -->
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:scaleType="fitXY"
-        android:layout_gravity="center_horizontal"
-        android:antialias="true"/>
-
-    <TextView
-        android:id="@android:id/title"
-        style="@style/TextAppearance.EntityHeaderTitle"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_horizontal"
-        android:paddingTop="8dp"/>
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@android:id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="@android:style/TextAppearance.Material.Body1"
-        android:textColor="?android:attr/textColorSecondary"/>
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+            android:scaleType="fitXY"
+            android:layout_gravity="center_horizontal"
+            android:antialias="true"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@android:id/title"
+                style="@style/TextAppearance.EntityHeaderTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:gravity="start"
+                android:paddingTop="8dp"/>
+
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:singleLine="true"
+                android:ellipsize="marquee"
+                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textColor="?android:attr/textColorSecondary"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
 
     <LinearLayout
         android:id="@+id/app_detail_links"
diff --git a/res/xml/installed_app_details_ia.xml b/res/xml/installed_app_details_ia.xml
index f4603ed3653..e72384a0bf1 100644
--- a/res/xml/installed_app_details_ia.xml
+++ b/res/xml/installed_app_details_ia.xml
@@ -22,6 +22,16 @@
         android:layout="@layout/app_details"
         android:selectable="false"/>
 
+    <Preference
+        android:key="notification_settings"
+        android:title="@string/notifications_label"
+        android:selectable="true"/>
+
+    <Preference
+        android:key="permission_settings"
+        android:title="@string/permissions_label"
+        android:selectable="true"/>
+
     <Preference
         android:key="storage_settings"
         android:title="@string/storage_settings"
@@ -33,13 +43,8 @@
         android:selectable="true"/>
 
     <Preference
-        android:key="permission_settings"
-        android:title="@string/permissions_label"
-        android:selectable="true"/>
-
-    <Preference
-        android:key="notification_settings"
-        android:title="@string/notifications_label"
+        android:key="battery"
+        android:title="@string/power_usage_summary_title"
         android:selectable="true"/>
 
     <Preference
@@ -47,11 +52,6 @@
         android:title="@string/launch_by_default"
         android:selectable="true"/>
 
-    <Preference
-        android:key="battery"
-        android:title="@string/power_usage_summary_title"
-        android:selectable="true"/>
-
     <Preference
         android:key="memory"
         android:title="@string/memory_settings_title"