From dce047fba2fb2f2f5b7c5c5cd0108c8993bded74 Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Wed, 3 Apr 2019 16:32:18 +0800
Subject: [PATCH] Tweak bar chart measurement.

Test: visual
Fixes: 129480652
Fixes: 129481095
Change-Id: Ie08a31c487477aeaa40e06b8df9cb7571dd5d15f
---
 .../BarChartPreference/res/layout/settings_bar_chart.xml      | 1 +
 packages/SettingsLib/BarChartPreference/res/values/dimens.xml | 2 +-
 packages/SettingsLib/BarChartPreference/res/values/styles.xml | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml b/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml
index 25246d63f2b76..0a336bf879c12 100644
--- a/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml
+++ b/packages/SettingsLib/BarChartPreference/res/layout/settings_bar_chart.xml
@@ -36,6 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
             android:gravity="center|bottom">
 
             <com.android.settingslib.widget.BarView
diff --git a/packages/SettingsLib/BarChartPreference/res/values/dimens.xml b/packages/SettingsLib/BarChartPreference/res/values/dimens.xml
index 7148afa2d62fb..5f741a0ad4a85 100644
--- a/packages/SettingsLib/BarChartPreference/res/values/dimens.xml
+++ b/packages/SettingsLib/BarChartPreference/res/values/dimens.xml
@@ -16,6 +16,6 @@
   -->
 
 <resources>
-    <dimen name="settings_bar_view_max_height">106dp</dimen>
+    <dimen name="settings_bar_view_max_height">72dp</dimen>
     <dimen name="settings_bar_view_icon_size">24dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/BarChartPreference/res/values/styles.xml b/packages/SettingsLib/BarChartPreference/res/values/styles.xml
index 8302c0118adfb..7a3fb7d9386ea 100644
--- a/packages/SettingsLib/BarChartPreference/res/values/styles.xml
+++ b/packages/SettingsLib/BarChartPreference/res/values/styles.xml
@@ -40,7 +40,7 @@
 
     <style name="SettingsBarViewStyle">
         <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">250dp</item>
+        <item name="android:layout_height">168dp</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_marginStart">8dp</item>
         <item name="android:layout_marginEnd">8dp</item>
@@ -63,6 +63,7 @@
         <item name="android:layout_height">@dimen/settings_bar_view_icon_size</item>
         <item name="android:scaleType">fitCenter</item>
         <item name="android:layout_marginTop">12dp</item>
+        <item name="android:tint">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="SettingsBarChartBarTitle">
@@ -78,7 +79,6 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">4dp</item>
-        <item name="android:layout_marginBottom">12dp</item>
         <item name="android:singleLine">true</item>
         <item name="android:ellipsize">marquee</item>
         <item name="android:textAppearance">@style/BarChart.Text.Summary</item>