PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update the UI for battery header" into oc-dr1-dev

Browse Source 
am: 923f50fce6

Change-Id: Iee54c0fa4ff744ecadefe8fa75e069920569cb9e
This commit is contained in:
jackqdyulei
2017-06-28 19:44:55 +00:00
committed by android-build-merger
parent 91dbfc6ee9 923f50fce6
commit 9d4a2806a8
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/layout/battery_header.xml
View File

@@ -28,15 +28,15 @@
style="@style/EntityHeader"> style="@style/EntityHeader">
<LinearLayout <LinearLayout
android:layout_width="216dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="48dp" android:layout_weight="1"
android:layout_marginEnd="12dp" android:layout_marginStart="56dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/battery_percent" android:id="@+id/battery_percent"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
@@ -44,14 +44,14 @@
<TextView <TextView
android:id="@+id/summary1" android:id="@+id/summary1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="8dp"
android:textAppearance="@android:style/TextAppearance.Material.Small"/> android:textAppearance="@android:style/TextAppearance.Material.Small"/>
<TextView <TextView
android:id="@+id/summary2" android:id="@+id/summary2"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Small"/> android:textAppearance="@android:style/TextAppearance.Material.Small"/>
@@ -61,7 +61,6 @@
android:id="@+id/battery_header_icon" android:id="@+id/battery_header_icon"
android:layout_width="@dimen/battery_meter_width" android:layout_width="@dimen/battery_meter_width"
android:layout_height="@dimen/battery_meter_height" android:layout_height="@dimen/battery_meter_height"
android:layout_gravity="end" android:layout_marginEnd="16dp"/>
android:layout_marginEnd="24dp"/>
</LinearLayout> </LinearLayout>