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

Commit ddb69797 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use NotificationAction style for onboarding notifications" into main

parents f1c3b41f bd77ff0c

packages/SystemUI/res/layout/onboarding_bundles_affordance.xml

+2 −4
Original line number Diff line number Diff line
@@ -89,10 +89,9 @@ 
                android:focusable="true"

                android:forceHasOverlappingRendering="false"

                android:paddingHorizontal="16dp"

                android:paddingTop="10dp"

                android:paddingBottom="4dp"

                android:gravity="center"

                android:text="@string/learn_more"

                style="@androidprv:style/NotificationAction"

                android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />

            <TextView

                android:id="@+id/btn_dismiss"
@@ -104,10 +103,9 @@ 
                android:focusable="true"

                android:forceHasOverlappingRendering="false"

                android:paddingHorizontal="16dp"

                android:paddingTop="10dp"

                android:paddingBottom="4dp"

                android:gravity="center"

                android:text="@string/got_it"

                style="@androidprv:style/NotificationAction"

                android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />

      </LinearLayout>

packages/SystemUI/res/layout/onboarding_summaries_affordance.xml

+2 −4
Original line number Diff line number Diff line
@@ -82,10 +82,9 @@ 
              android:focusable="true"

              android:forceHasOverlappingRendering="false"

              android:paddingHorizontal="16dp"

              android:paddingTop="10dp"

              android:paddingBottom="4dp"

              android:gravity="center"

              android:text="@string/notification_onboarding_summaries_turn_on"

              style="@androidprv:style/NotificationAction"

              android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />

          <TextView

              android:id="@+id/btn_dismiss"
@@ -97,10 +96,9 @@ 
              android:focusable="true"

              android:forceHasOverlappingRendering="false"

              android:paddingHorizontal="16dp"

              android:paddingTop="10dp"

              android:paddingBottom="4dp"

              android:gravity="center"

              android:text="@string/got_it"

              style="@androidprv:style/NotificationAction"

              android:textColor="@androidprv:color/materialColorOnTertiaryFixedVariant" />

    </LinearLayout>