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

Commit f784e332 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge remote-tracking branch 'origin/lineage-23.2' into a16.2

parents 70361d96 5277aa9b

core/res/res/drawable/toast_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
-->

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

       android:shape="rectangle">

    <solid android:color="?android:attr/colorSurface" />

    <solid android:color="?android:attr/colorBackgroundFloating" />

    <corners android:radius="28dp" />

</shape>

packages/SystemUI/src/com/android/systemui/statusbar/events/ui/view/BatteryStatusEventComposeChip.kt

+7 −1
Original line number Diff line number Diff line
@@ -146,7 +146,13 @@ private fun BatteryAndPercentChip( 
                levelProvider = { level },

                showLevelProvider = { false },

                isFullProvider = { isFull },

                glyphsProvider = { emptyList() },

                glyphsProvider = {

                    if (showPercentNextToIcon) {

                        emptyList()

                    } else {

                        level.glyphRepresentation()

                    }

                },

                colorsProvider = { BatteryColors.DarkTheme.Charging },

                modifier = Modifier.height(height).wrapContentWidth(),

                contentDescription = "",

packages/SystemUI/src/com/android/systemui/toast/ToastUI.java

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ public class ToastUI implements 
                return;

            }

            Context displayContext = context.createDisplayContext(display);

            mToast = mToastFactory.createToast(mContext, displayContext /* sysuiContext */, text,

            mToast = mToastFactory.createToast(mContext, mContext /* sysuiContext */, text,

                    packageName, userHandle.getIdentifier(), mOrientation);



            if (mToast.getInAnimation() != null) {