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

Commit d81baa74 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/v3.0-a15' into a15

parents 3c150eb1 c2ebd505

core/res/res/drawable/floating_popup_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/materialColorSurfaceContainerHighest"/>

    <solid android:color="@color/e_floating_background"/>

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>

packages/SettingsLib/ActionButtonsPreference/res/layout-v33/settingslib_action_buttons.xml

+3 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


    <Button

        android:id="@+id/button1"

        android:drawableTint="@*android:color/e_accent"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -42,7 +42,7 @@ 


    <Button

        android:id="@+id/button2"

        android:drawableTint="@*android:color/e_accent"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -59,7 +59,7 @@ 


    <Button

        android:id="@+id/button3"

        android:drawableTint="@*android:color/e_accent"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -76,7 +76,6 @@ 


    <Button

        android:id="@+id/button4"

        android:drawableTint="@*android:color/e_accent"

        style="@style/SettingsLibActionButton"

        android:layout_width="0dp"

        android:layout_height="match_parent"

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/section/CommunalPopupSection.kt

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ constructor( 
                                        )

                                )

                        )

                        .background(colors.secondary, RoundedCornerShape(50.dp)),

                        .background(colors.primary, RoundedCornerShape(50.dp)),

                onClick = onClick,

            ) {

                Row(
@@ -160,14 +160,14 @@ constructor( 
                    Icon(

                        imageVector = Icons.Outlined.Widgets,

                        contentDescription = null,

                        tint = colors.onSecondary,

                        tint = colors.surface,

                        modifier = Modifier.size(20.dp)

                    )

                    Spacer(modifier = Modifier.size(8.dp))

                    Text(

                        text = stringResource(R.string.button_to_configure_widgets_text),

                        style = MaterialTheme.typography.titleSmall,

                        color = colors.onSecondary

                        color = colors.surface

                    )

                }

            }

packages/SystemUI/res/drawable/clipboard_minimized_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,6 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:shape="rectangle">

    <solid android:color="?androidprv:attr/colorAccentSecondary"/>

    <solid android:color="@*android:color/e_accent"/>

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

</shape>

packages/SystemUI/res/layout/clipboard_overlay.xml

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ 
                  android:autoSizeMaxTextSize="@dimen/clipboard_overlay_max_font"

                  android:textColor="?attr/overlayButtonTextColor"

                  android:textColorLink="?attr/overlayButtonTextColor"

                  android:background="?androidprv:attr/colorAccentSecondary"

                  android:background="@*android:color/e_accent"

                  android:layout_width="@dimen/clipboard_preview_size"

                  android:layout_height="@dimen/clipboard_preview_size"/>

        <ImageView