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

Merge "Ui changes in battery main page" into oc-dev

Browse Source 
am: f297e843e9

Change-Id: I3b96043a327498f0ed935a80a24d6fffbd36c913
This commit is contained in:
jackqdyulei
2017-04-05 22:25:48 +00:00
committed by android-build-merger
parent 53352cd318 f297e843e9
commit a242548be7
6 changed files with 154 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/layout/battery_header.xml
View File

@@ -27,44 +27,35 @@
android:background="@drawable/selectable_card_grey"
style="@style/EntityHeader">
<com.android.settings.fuelgauge.BatteryMeterView
android:id="@+id/battery_header_icon"
android:layout_width="@dimen/battery_meter_width"
android:layout_height="@dimen/battery_meter_height"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="216dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginStart="48dp"
android:layout_marginEnd="12dp"
android:orientation="vertical">
<TextView
android:id="@+id/time"
android:id="@+id/battery_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:textAppearance="@android:style/TextAppearance.Material.Medium"/>
android:textAppearance="@android:style/TextAppearance.Material.Display1"/>
<TextView
android:id="@+id/summary1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:text="@string/estimated_time_left"/>
<TextView
android:id="@+id/summary2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:gravity="center"
android:textAppearance="@android:style/TextAppearance.Material.Small"
android:text="@string/estimated_time_description"/>
</LinearLayout>
<com.android.settings.fuelgauge.BatteryMeterView
android:id="@+id/battery_header_icon"
android:layout_width="@dimen/battery_meter_width"
android:layout_height="@dimen/battery_meter_height"
android:layout_gravity="end"
android:layout_marginEnd="24dp"/>
</LinearLayout>

31
res/xml/power_usage_summary.xml
View File

@@ -25,6 +25,19 @@
android:selectable="true"
android:layout="@layout/battery_header"/>
<PreferenceCategory
android:key="device_usage_list">
<com.android.settings.fuelgauge.PowerGaugePreference
android:key="last_full_charge"
android:title="@string/battery_last_full_charge"/>
<com.android.settings.fuelgauge.PowerGaugePreference
android:key="screen_usage"
android:title="@string/device_screen_usage"/>
</PreferenceCategory>
<PreferenceCategory
android:key="power_management"
android:title="@string/battery_power_management">
@@ -60,22 +73,4 @@
android:key="app_list"
android:title="@string/power_usage_list_summary"/>
<PreferenceCategory
android:key="device_usage_list"
android:title="@string/device_usage_list_summary">
<Preference
android:key="screen_usage"
android:title="@string/device_screen_usage"/>
<Preference
android:key="screen_consumption"
android:title="@string/device_screen_consumption"/>
<Preference
android:key="cellular_network"
android:title="@string/device_cellular_network"/>
</PreferenceCategory>
</PreferenceScreen>