Show date in system bar.

Bug: 2996123
Change-Id: If2f588defaa4c27bf6010e14c946c5ab2894e1db

4 files changed, 28 insertions, 18 deletions

diff --git a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml
index 7e469f7..e6ec9f4 100644
--- a/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml
+++ b/packages/SystemUI/res/layout-xlarge/sysbar_panel_system.xml
@@ -172,37 +172,44 @@
         android:layout_width="match_parent"
         android:layout_height="48dip"
         >
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:orientation="horizontal"
-            >
-            <!-- TODO: alarm -->
-            <!-- TODO: sync -->
-            <TextView android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                />
-        </LinearLayout>
-
         <TextView android:id="@+id/settings_button"
             style="@style/TextAppearance.StatusBar.TextButton"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
             android:paddingRight="32dip"
             android:paddingLeft="32dip"
             android:textSize="20sp"
+            android:gravity="center"
             android:text="@string/system_panel_settings_button"
             />
         <View
+            android:id="@+id/settings_left_divider"
             android:layout_height="match_parent"
             android:layout_width="1sp"
             android:layout_toLeftOf="@id/settings_button"
             android:background="@*android:drawable/divider_vertical_dark"
             />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_toLeftOf="@id/settings_left_divider"
+            android:orientation="horizontal"
+            android:gravity="left|center_vertical"
+            >
+            <!-- TODO: alarm -->
+            <!-- TODO: sync -->
+            <com.android.systemui.statusbar.DateView
+                android:id="@+id/date"
+                style="@style/TextAppearance.StatusBar.SystemPanel"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:singleLine="true"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
 
     </RelativeLayout>
 </com.android.systemui.statusbar.tablet.SystemPanel>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index f592703..5aefb02 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -30,7 +30,7 @@
         parent="@android:style/TextAppearance.StatusBar">
         <item name="android:textAppearance">?android:attr/textAppearance</item>
         <item name="android:textStyle">normal</item>
-        <item name="android:textColor">#50FFFFFF</item>
+        <item name="android:textColor">#FF808080</item>
     </style>
 
     <style name="TextAppearance.StatusBar.TextButton"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java b/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java
index e6d3a7e..e127038 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/DateView.java
@@ -70,7 +70,7 @@ public final class DateView extends TextView {
         setText(DateFormat.getDateInstance(DateFormat.LONG).format(now));
     }
 
-    void setUpdates(boolean update) {
+    public void setUpdates(boolean update) {
         if (update != mUpdating) {
             mUpdating = update;
             if (update) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java
index b4a9d76..c9a8d56 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/SystemPanel.java
@@ -431,6 +431,9 @@ public class SystemPanel extends LinearLayout implements StatusBarPanel {
     }
 
     public void onAttachedToWindow() {
+        DateView date = (DateView)findViewById(R.id.date);
+        date.setUpdates(true);
+
         TextView settingsButton = (TextView)findViewById(R.id.settings_button);
         settingsButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {