Visual refresh of notification panel header.

CLOCK - 2 LINE DATE - ROTATION LOCK - SETTINGS ---- CLEAR ALL

Bug: 6418617
Change-Id: I477b59d83aaefc6943ed3cfd5bb4e3f4072a8471

Conflicts:

	packages/SystemUI/res/values/strings.xml

1 files changed, 35 insertions, 14 deletions

diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 1de4ab8..8715a99 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -38,14 +38,25 @@
         android:paddingRight="3dp"
         android:background="@drawable/notification_header_bg"
         >
-        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
-            android:textAppearance="@style/TextAppearance.StatusBar.Date"
+        <com.android.systemui.statusbar.policy.Clock
+            android:id="@+id/clock"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="8dp"
             android:singleLine="true"
-            android:gravity="center_vertical|left"
-            android:paddingLeft="16dp"
+            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
+            />
+
+        <com.android.systemui.statusbar.policy.DateView android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/clock"
+            android:layout_marginLeft="8dp"
+            android:paddingLeft="8dp"
+            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"
             />
         <!--
         <com.android.systemui.statusbar.phone.CarrierLabel
@@ -62,22 +73,32 @@
             />
         -->
 
-        <ImageView android:id="@+id/settings_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+        <com.android.systemui.statusbar.RotationToggle android:id="@+id/rotation_lock_button"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_centerVertical="true"
             android:layout_toRightOf="@id/date"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
+            android:layout_marginLeft="12dp"
+            android:button="@drawable/ic_notify_rotation"
+            android:contentDescription="@string/accessibility_rotation_lock_off"
+            />
+
+        <ImageView android:id="@+id/settings_button"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="8dp"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/rotation_lock_button"
             android:src="@drawable/ic_notify_quicksettings"
             android:contentDescription="@string/accessibility_settings_button"
             />
 
         <ImageView android:id="@+id/clear_all_button"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="8dp"
+            android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
             android:src="@drawable/ic_notify_clear"
             android:contentDescription="@string/accessibility_clear_all"
             />