For #24055 - Replace ?accent with Action Primary for Primary Buttons

upstream-sync
Gabriel Luong 2 years ago committed by mergify[bot]
parent bd9c969571
commit d19f7a7fad

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp"/>
<solid android:color="?accent" />
<solid android:color="?actionPrimary" />
</shape>

@ -5,5 +5,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp"/>
<solid android:color="?accent" />
<solid android:color="?actionPrimary" />
</shape>

@ -75,7 +75,6 @@
android:layout_width="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:backgroundTint="?accent"
android:text="@string/mozac_feature_downloads_button_open"
android:textAllCaps="false"
app:layout_constraintEnd_toEndOf="parent"

@ -209,7 +209,6 @@
android:layout_marginHorizontal="64dp"
android:layout_marginTop="42dp"
android:background="@drawable/onboarding_padded_background"
android:backgroundTint="?accent"
android:text="@string/onboarding_finish"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

@ -66,7 +66,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:backgroundTint="?accent"
android:letterSpacing="0"
android:text="@string/add_to_homescreen_title"
android:textAllCaps="false"

@ -6,7 +6,7 @@
style="@style/PositiveButton"
android:id="@+id/finish_button"
android:background="@drawable/onboarding_padded_background"
android:backgroundTint="?accent"
android:backgroundTint="?actionPrimary"
android:layout_marginBottom="10dp"
android:layout_marginHorizontal="@dimen/home_item_horizontal_margin"
android:text="@string/onboarding_finish" />

@ -10,6 +10,10 @@
<attr name="layer3" format="reference" />
<attr name="scrim" format="reference" />
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<attr name="actionPrimary" format="reference" />
<!-- Text -->
<!-- Small heading, Text link -->
<attr name="textAccent" format="reference" />

@ -147,7 +147,7 @@
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<color name="fx_mobile_private_action_color_primary" tools:ignore="UnusedResources">@color/photonViolet60</color>
<color name="fx_mobile_private_action_color_primary">@color/photonViolet60</color>
<!-- Secondary button -->
<color name="fx_mobile_private_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
<!-- Filter -->

@ -38,6 +38,10 @@
<item name="layer3">@color/fx_mobile_layer_color_3</item>
<item name="scrim">@color/fx_mobile_layer_color_scrim</item>
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<item name="actionPrimary">@color/fx_mobile_action_color_primary</item>
<!-- Text -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_text_color_accent</item>
@ -225,6 +229,10 @@
<item name="layer3">@color/fx_mobile_private_layer_color_3</item>
<item name="scrim">@color/fx_mobile_private_layer_color_scrim</item>
<!-- Action -->
<!-- Primary button, Snackbar, Floating action button, Chip selected -->
<item name="actionPrimary">@color/fx_mobile_private_action_color_primary</item>
<!-- Text -->
<!-- Small heading, Text link -->
<item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
@ -347,7 +355,7 @@
</style>
<style name="PositiveButton" parent="NeutralButton">
<item name="backgroundTint">?accent</item>
<item name="backgroundTint">?actionPrimary</item>
<item name="iconTint">?contrastText</item>
<item name="android:textColor">?contrastText</item>
</style>

Loading…
Cancel
Save