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

Commit e3ddac3a authored by d34d's avatar d34d Committed by Gerrit Code Review
Browse files

SysUI: Adjust battery dimensions for better look 

Make some minor tweaks to the new vector based batter meter to get
it even closer to stock look.

Change-Id: I80fcdefb2578352bef5ca35ad902556b204de322
parent b7583ae4

packages/SystemUI/res/drawable/ic_battery_portrait_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ 
    <path

        android:name="frame"

        android:fillColor="@color/batterymeter_frame_color"

        android:pathData="M19,2v20L5,22V2H19z" />

        android:pathData="M19,2v19H5V2H19z" />



</vector>
 
 No newline at end of file

packages/SystemUI/res/layout/status_bar.xml

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:singleLine="true"

                android:paddingStart="7dp"

                android:paddingStart="3dp"

                android:gravity="center_vertical|start"

                />

        </com.android.keyguard.AlphaOptimizedLinearLayout>

packages/SystemUI/res/layout/system_icons.xml

+4 −4
Original line number Diff line number Diff line
@@ -34,14 +34,14 @@ 


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

    <com.android.systemui.BatteryMeterView android:id="@+id/battery"

        android:layout_height="19dp"

        android:layout_width="19dp"

        android:layout_height="18dp"

        android:layout_width="18dp"

        android:layout_marginBottom="@dimen/battery_margin_bottom"

        android:layout_marginStart="@dimen/signal_cluster_battery_padding"/>



    <com.android.systemui.DockBatteryMeterView android:id="@+id/dock_battery"

        android:layout_height="19dp"

        android:layout_width="19dp"

        android:layout_height="18dp"

        android:layout_width="18dp"

        android:layout_marginBottom="@dimen/battery_margin_bottom"

        android:layout_marginStart="@dimen/signal_cluster_battery_padding"

        android:visibility="gone"/>

packages/SystemUI/res/values/cm_strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -260,9 +260,9 @@ 
   <string name="play_queue_extention">Show play queue</string>



    <!-- Path data for portrait battery -->

    <string name="battery_portrait_path_full" translatable="false">M19,22v-20L5,2V22H19z</string>

    <string name="battery_portrait_path_empty" translatable="false">M19,22v0.0L5,22V22H19z</string>

    <string name="battery_portrait_clip_path" translatable="false">M5,22V4h4V2h6v2h4v18L5,22z</string>

    <string name="battery_portrait_path_full" translatable="false">M 5 2 H 19 V 21 H 5 V 2 Z</string>

    <string name="battery_portrait_path_empty" translatable="false">M 5 21 H 19 V 21 H 5 V 21 Z</string>

    <string name="battery_portrait_clip_path" translatable="false">M6,21V4h3V2h6v2h3v17H6z</string>



    <!-- Path data for landscape battery -->

    <string name="battery_landscape_path_full" translatable="false">M 1 4 H 25 V 20 H 1 V 4 Z</string>

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -531,7 +531,7 @@ 
    <dimen name="fake_shadow_size">8dp</dimen>



    <!-- Padding between signal cluster and battery icon -->

    <dimen name="signal_cluster_battery_padding">7dp</dimen>

    <dimen name="signal_cluster_battery_padding">3dp</dimen>



    <!-- Padding for signal cluster and battery icon when there are not icons in signal cluster -->

    <dimen name="no_signal_cluster_battery_padding">3dp</dimen>