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

Merge "Fix bug #15384992 Setting Dashboard - padding updates" into lmp-preview-dev

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-06-11 23:31:50 +00:00
committed by Android (Google) Code Review
parent 3864cda8fd 601aad2022
commit deb0883989
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
res/layout/battery_history_chart.xml
View File

@@ -14,22 +14,29 @@
limitations under the License. limitations under the License.
--> -->
<com.android.settings.fuelgauge.BatteryHistoryChart <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
xmlns:app="http://schemas.android.com/apk/res/com.android.settings" android:layout_height="wrap_content"
android:layout_width="match_parent" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:layout_height="wrap_content" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
android:gravity="center_vertical"
android:id="@+android:id/battery_history_chart" <com.android.settings.fuelgauge.BatteryHistoryChart
android:paddingEnd="?android:attr/scrollbarSize" xmlns:android="http://schemas.android.com/apk/res/android"
android:textAppearance="?android:attr/textAppearanceSmall" xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
android:textColor="#ff000000" android:layout_width="match_parent"
app:headerAppearance="?android:attr/textAppearanceMedium" android:layout_height="match_parent"
android:shadowRadius="4" android:gravity="center_vertical"
android:shadowColor="?android:attr/colorBackground" android:id="@+android:id/battery_history_chart"
android:shadowDx="2" android:textAppearance="?android:attr/textAppearanceSmall"
android:shadowDy="2" android:textColor="#ff000000"
app:barPrimaryColor="?android:attr/colorControlActivated" app:headerAppearance="?android:attr/textAppearanceMedium"
app:barPredictionColor="@color/material_empty_color_light" android:shadowRadius="4"
app:chartMinHeight="@dimen/battery_history_chart_height"> android:shadowColor="?android:attr/colorBackground"
</com.android.settings.fuelgauge.BatteryHistoryChart> android:shadowDx="2"
android:shadowDy="2"
app:barPrimaryColor="?android:attr/colorControlActivated"
app:barPredictionColor="@color/material_empty_color_light"
app:chartMinHeight="@dimen/battery_history_chart_height">
</com.android.settings.fuelgauge.BatteryHistoryChart>
</FrameLayout>

6
res/layout/preference_batteryhistory.xml
View File

@@ -18,11 +18,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:minHeight="@dimen/battery_history_chart_height" android:minHeight="@dimen/battery_history_chart_height">
android:paddingEnd="?android:attr/scrollbarSize">
<include layout="@layout/battery_history_chart" /> <include layout="@layout/battery_history_chart" />
<TextView android:id="@+id/labelsHeader" <TextView android:id="@+id/labelsHeader"
android:layout_width="match_parent" android:layout_height="48dp" android:layout_width="match_parent"
android:layout_height="48dp"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?android:attr/colorControlActivated" android:textColor="?android:attr/colorControlActivated"

2
res/values/dimens.xml
View File

@@ -74,7 +74,7 @@
<dimen name="captioning_preview_height">200dp</dimen> <dimen name="captioning_preview_height">200dp</dimen>
<dimen name="settings_side_margin">@*android:dimen/preference_fragment_padding_side</dimen> <dimen name="settings_side_margin">0dip</dimen>
<!-- Weight of the left pane in a multi-pane preference layout. --> <!-- Weight of the left pane in a multi-pane preference layout. -->
<integer name="preferences_left_pane_weight">4</integer> <integer name="preferences_left_pane_weight">4</integer>