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

Commit 9d87f94c authored by Roman Birg's avatar Roman Birg
Browse files

SystemUI: fix battery icon jump on qs expand 



The layouts are slightly different for the header and icon layouts.

Change-Id: I85d3fc007eb9b2c3e2ba09bb761a91b521b89700
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 20531aff

packages/SystemUI/res/layout/keyguard_status_bar.xml

+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,16 @@ 
            >

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

        </FrameLayout>

        <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="@dimen/header_battery_margin_keyguard"

            android:paddingEnd="@dimen/battery_level_padding_end"

            android:textColor="#ffffff"

            android:visibility="gone"

            android:textSize="@dimen/battery_level_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    </LinearLayout>



    <com.android.keyguard.CarrierText

packages/SystemUI/res/layout/status_bar.xml

+8 −0
Original line number Diff line number Diff line
@@ -97,6 +97,14 @@ 


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



            <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text"

               android:layout_width="wrap_content"

               android:layout_height="wrap_content"

               android:layout_gravity="center_vertical"

               android:layout_marginStart="@dimen/header_battery_margin_keyguard"

               android:textColor="#ffffff"

               android:textSize="@dimen/battery_level_text_size" />



            <TextView

                android:id="@+id/clock"

                android:textAppearance="@style/TextAppearance.StatusBar.Clock"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+9 −0
Original line number Diff line number Diff line
@@ -68,6 +68,15 @@ 
            >

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

        </FrameLayout>

        <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:layout_marginStart="@dimen/header_battery_margin_expanded"

            android:paddingEnd="@dimen/battery_level_padding_end"

            android:textColor="@color/status_bar_battery_level_text_color"

            android:textSize="@dimen/battery_level_text_size"

            android:importantForAccessibility="noHideDescendants"/>

    </LinearLayout>



    <TextView

packages/SystemUI/res/layout/system_icons.xml

+0 −7
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ 
        android:layout_width="9.5dp"

        android:layout_marginBottom="@dimen/battery_margin_bottom"

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

     <com.android.systemui.BatteryLevelTextView android:id="@+id/battery_level_text"

         android:layout_width="wrap_content"

         android:layout_height="wrap_content"

         android:layout_gravity="center_vertical"

         android:layout_marginStart="@dimen/header_battery_margin_keyguard"

         android:textColor="#ffffff"

         android:textSize="@dimen/battery_level_text_size" />



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

        android:layout_height="14.5dp"