base: dock battery

Change-Id: I8cc3fc465daa49c9010bdbbf876dae18461d7024
Require: topic:dock_battery
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

Improve dock battery strings

Change-Id: Iccfa2df4ec608ae02c0bfcef99648788dab95933

systemui: fix battery text level visibility

Use present flag instead of plug-in flag to determine the battery present (only hide the
text level view if the battery is not present)

Change-Id: I8e20e107bbeeecdc846833dc80c1a2754d82a039
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

systemui: restore space between clock & battery

Initialize dock battery to GONE visibility because isn't update on device not supporting
dock battery.

Change-Id: I23aeafc27db0fc499050a7306e8549293accb507
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

SystemUI: fix battery icon jump on qs expand

The layouts are slightly different for the header and icon layouts.

Change-Id: I85d3fc007eb9b2c3e2ba09bb761a91b521b89700
Signed-off-by: Roman Birg <roman@cyngn.com>

systemui: move dock battery level views outside systemicons layout

At not the ideal, this at least will match normal battery level view, puttings battery levels
in the correct order. In addition fix two small dock battery bugs:
 -  BatteryLevelTextView not displayed if mode is TEXT
 -  Properly hide DockBatteryMetterView for modes NONE and TEXT
 -  Underline the dock BatteryLevelTextView to differentiate normal from dock text view

Screenshot: https://cloud.ruesga.com/f/74fe240c66/

Change-Id: Idfd3a4bb2f19bd29f9f4dd2b0ea7f645bb531986
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

4 files changed, 38 insertions, 1 deletions

diff --git a/packages/SystemUI/res/layout/keyguard_status_bar.xml b/packages/SystemUI/res/layout/keyguard_status_bar.xml
index 6cca05f..fcd7e62 100644
--- a/packages/SystemUI/res/layout/keyguard_status_bar.xml
+++ b/packages/SystemUI/res/layout/keyguard_status_bar.xml
@@ -62,6 +62,16 @@
             android:visibility="gone"
             android:textSize="@dimen/battery_level_text_size"
             android:importantForAccessibility="noHideDescendants"/>
+        <com.android.systemui.DockBatteryLevelTextView android:id="@+id/dock_battery_level_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/header_battery_margin_keyguard"
+            android:paddingEnd="@dimen/battery_level_padding_end"
+            android:textColor="@color/status_bar_battery_level_text_color"
+            android:visibility="gone"
+            android:textSize="@dimen/battery_level_text_size"
+            android:importantForAccessibility="noHideDescendants"/>
     </LinearLayout>
 
     <com.android.keyguard.CarrierText
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index 3bedf3f..51f7df7 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -103,6 +103,15 @@
                 android:textColor="@color/status_bar_battery_level_text_color"
                 android:textSize="@dimen/battery_level_text_size" />
 
+            <com.android.systemui.BatteryLevelTextView android:id="@+id/dock_battery_level_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="@dimen/header_battery_margin_keyguard"
+                android:textColor="@color/status_bar_battery_level_text_color"
+                android:textSize="@dimen/battery_level_text_size"
+                android:visibility="gone"/>
+
             <com.android.systemui.statusbar.policy.Clock
                 android:id="@+id/clock"
                 android:textAppearance="@style/TextAppearance.StatusBar.Clock"
diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
index 5effca4..a017a2e 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml
@@ -94,6 +94,16 @@
             android:textColor="@color/status_bar_battery_level_text_color"
             android:textSize="@dimen/battery_level_text_size"
             android:importantForAccessibility="noHideDescendants"/>
+        <com.android.systemui.DockBatteryLevelTextView android:id="@+id/dock_battery_level_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="@dimen/header_battery_margin_expanded"
+            android:paddingEnd="@dimen/battery_level_padding_end"
+            android:textColor="@color/status_bar_battery_level_text_color"
+            android:textSize="@dimen/battery_level_text_size"
+            android:importantForAccessibility="noHideDescendants"
+            android:visibility="gone"/>
     </LinearLayout>
 
     <TextView
diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml
index 8d15898..82e0667 100644
--- a/packages/SystemUI/res/layout/system_icons.xml
+++ b/packages/SystemUI/res/layout/system_icons.xml
@@ -38,4 +38,12 @@
         android:layout_width="9.5dp"
         android:layout_marginBottom="@dimen/battery_margin_bottom"
         android:layout_marginStart="@dimen/signal_cluster_battery_padding"/>
-</LinearLayout>
\ No newline at end of file
+
+    <com.android.systemui.DockBatteryMeterView android:id="@+id/dock_battery"
+        android:layout_height="14.5dp"
+        android:layout_width="9.5dp"
+        android:layout_marginBottom="@dimen/battery_margin_bottom"
+        android:layout_marginStart="@dimen/signal_cluster_battery_padding"
+        android:visibility="gone"/>
+
+</LinearLayout>