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

Commit 3dfa5eb9 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Toward regularizing color & level across battery indicators." into klp-dev

parents 0155a90e dfaf3bde

packages/SystemUI/res/drawable-nodpi/lightning.png

0 → 100644
+2.83 KiB
Loading image diff...

packages/SystemUI/res/layout/quick_settings_tile_battery.xml

+5 −5
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
        android:layout_height="match_parent"

        android:layout_gravity="top"

        android:orientation="vertical">

    <ImageView

    <com.android.systemui.BatteryMeterView

            android:id="@+id/image"

            android:layout_marginTop="@dimen/qs_tile_margin_above_icon"

            android:layout_marginBottom="@dimen/qs_tile_margin_below_icon"

            android:layout_width="@dimen/qs_tile_icon_size"

            android:layout_height="@dimen/qs_tile_icon_size"

            android:layout_width="22dp"

            android:layout_height="32dp"

            android:padding="3dp"

            android:layout_gravity="top|center_horizontal"

            android:scaleType="centerInside"

            />

    <TextView

            style="@style/TextAppearance.QuickSettings.TileView"

packages/SystemUI/res/layout/signal_cluster_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ 


<com.android.systemui.statusbar.SignalClusterView

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

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:layout_width="wrap_content"

    android:gravity="center"

    android:orientation="horizontal"

    >

    <FrameLayout

packages/SystemUI/res/layout/status_bar.xml

+6 −4
Original line number Diff line number Diff line
@@ -95,11 +95,13 @@ 
                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    />

                <ImageView

                <!-- battery must be padded below by 1px to match assets -->

                <com.android.systemui.BatteryMeterView

                    android:id="@+id/battery"

                    android:layout_height="wrap_content"

                    android:layout_width="wrap_content"

                    android:paddingStart="4dip"

                    android:layout_height="16dp"

                    android:layout_width="10dp"

                    android:paddingBottom="1px"

                    android:layout_marginStart="4dip"

                    />

            </LinearLayout>

packages/SystemUI/res/values/arrays.xml

+12 −0
Original line number Diff line number Diff line
@@ -40,4 +40,16 @@ 
        <item>@null</item>

    </array>



    <!-- BatteryMeterView parameters -->

    <array name="batterymeter_color_levels">

        <item>4</item>

        <item>15</item>

        <item>100</item>

    </array>

    <array name="batterymeter_color_values">

        <item>#FFFF0000</item>

        <item>#FFFE6600</item>

        <item>#FF3792B4</item>

    </array>



</resources>