Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deb08839 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 3864cda8 601aad20

res/layout/battery_history_chart.xml

+26 −19
Original line number Diff line number Diff line
@@ -14,14 +14,19 @@ 
     limitations under the License.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <com.android.settings.fuelgauge.BatteryHistoryChart

            xmlns:android="http://schemas.android.com/apk/res/android"

            xmlns:app="http://schemas.android.com/apk/res/com.android.settings"

        android:layout_width="match_parent"

    android:layout_height="wrap_content"

        android:layout_height="match_parent"

        android:gravity="center_vertical"

        android:id="@+android:id/battery_history_chart"

    android:paddingEnd="?android:attr/scrollbarSize"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="#ff000000"

        app:headerAppearance="?android:attr/textAppearanceMedium"
@@ -33,3 +38,5 @@ 
        app:barPredictionColor="@color/material_empty_color_light"

        app:chartMinHeight="@dimen/battery_history_chart_height">

    </com.android.settings.fuelgauge.BatteryHistoryChart>



</FrameLayout>
 
 No newline at end of file

res/layout/preference_batteryhistory.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:minHeight="@dimen/battery_history_chart_height"

        android:paddingEnd="?android:attr/scrollbarSize">

        android:minHeight="@dimen/battery_history_chart_height">

    <include layout="@layout/battery_history_chart" />

    <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:textSize="14sp"

              android:textColor="?android:attr/colorControlActivated"

res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 


    <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. -->

    <integer name="preferences_left_pane_weight">4</integer>