diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/SaveTabGroupViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/SaveTabGroupViewHolder.kt
index 6462645c3..3bde4170a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/SaveTabGroupViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/SaveTabGroupViewHolder.kt
@@ -6,7 +6,7 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders
import android.view.View
import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.save_tab_group_button.view.*
+import kotlinx.android.synthetic.main.save_to_collection_button.view.*
import org.mozilla.fenix.R
import org.mozilla.fenix.components.metrics.Event
import org.mozilla.fenix.ext.components
@@ -27,6 +27,6 @@ class SaveTabGroupViewHolder(
companion object {
const val TELEMETRY_HOME_IDENTIFIER = "home"
- const val LAYOUT_ID = R.layout.save_tab_group_button
+ const val LAYOUT_ID = R.layout.save_to_collection_button
}
}
diff --git a/app/src/main/res/drawable/onboarding_button_background.xml b/app/src/main/res/drawable/rounded_button_background.xml
similarity index 87%
rename from app/src/main/res/drawable/onboarding_button_background.xml
rename to app/src/main/res/drawable/rounded_button_background.xml
index ce3863996..61376f409 100644
--- a/app/src/main/res/drawable/onboarding_button_background.xml
+++ b/app/src/main/res/drawable/rounded_button_background.xml
@@ -7,13 +7,13 @@
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/component_permissions_blocked_by_android.xml b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
index 0a74f6fa5..5d179c8bb 100644
--- a/app/src/main/res/layout/component_permissions_blocked_by_android.xml
+++ b/app/src/main/res/layout/component_permissions_blocked_by_android.xml
@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_marginTop="32dp"
+ android:layout_marginTop="16dp"
android:paddingStart="@dimen/radio_button_preference_horizontal"
android:paddingEnd="@dimen/radio_button_preference_horizontal"
android:visibility="gone"
@@ -54,12 +54,8 @@
diff --git a/app/src/main/res/layout/component_sign_in.xml b/app/src/main/res/layout/component_sign_in.xml
index 62ba3defe..65458fdfa 100644
--- a/app/src/main/res/layout/component_sign_in.xml
+++ b/app/src/main/res/layout/component_sign_in.xml
@@ -6,17 +6,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/bookmark_folders_sign_in"
- style="@style/ThemeIndependentMaterialGreyButton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/sign_in_button_margin"
- android:layout_marginStart="@dimen/sign_in_button_margin"
- android:layout_marginTop="@dimen/sign_in_button_margin_top"
- android:paddingBottom="@dimen/sign_in_button_padding"
- android:paddingTop="@dimen/sign_in_button_padding"
+ style="@style/NeutralButton"
android:text="@string/bookmark_sign_in_button"
android:visibility="gone"
+ android:layout_marginHorizontal="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:rippleColor="?secondaryText"/>
+ app:layout_constraintStart_toStartOf="parent"/>
diff --git a/app/src/main/res/layout/delete_exceptions_button.xml b/app/src/main/res/layout/delete_exceptions_button.xml
index 0a54865ea..7b4bee99e 100644
--- a/app/src/main/res/layout/delete_exceptions_button.xml
+++ b/app/src/main/res/layout/delete_exceptions_button.xml
@@ -2,14 +2,10 @@
-
diff --git a/app/src/main/res/layout/fragment_add_new_device.xml b/app/src/main/res/layout/fragment_add_new_device.xml
index 863ba3ced..251a46c60 100644
--- a/app/src/main/res/layout/fragment_add_new_device.xml
+++ b/app/src/main/res/layout/fragment_add_new_device.xml
@@ -68,7 +68,7 @@
diff --git a/app/src/main/res/layout/fragment_installed_add_on_details.xml b/app/src/main/res/layout/fragment_installed_add_on_details.xml
index df24ad0ba..31de23ba7 100644
--- a/app/src/main/res/layout/fragment_installed_add_on_details.xml
+++ b/app/src/main/res/layout/fragment_installed_add_on_details.xml
@@ -75,11 +75,8 @@
diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
index d3684970b..cd7bac1de 100644
--- a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
+++ b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
@@ -23,13 +23,11 @@
diff --git a/app/src/main/res/layout/fragment_turn_on_sync.xml b/app/src/main/res/layout/fragment_turn_on_sync.xml
index 0350e4603..83b8714fd 100644
--- a/app/src/main/res/layout/fragment_turn_on_sync.xml
+++ b/app/src/main/res/layout/fragment_turn_on_sync.xml
@@ -56,34 +56,19 @@
+ app:layout_constraintTop_toBottomOf="@id/signInInstructions" />
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
index 514e73913..98d17de8a 100644
--- a/app/src/main/res/layout/history_list_item.xml
+++ b/app/src/main/res/layout/history_list_item.xml
@@ -10,14 +10,11 @@
android:orientation="vertical">
+ android:id="@+id/delete_button"
+ style="@style/DestructiveButton"
+ android:layout_marginHorizontal="16dp"
+ android:text="@string/history_delete_all"
+ android:visibility="gone" />
diff --git a/app/src/main/res/layout/layout_clear_permission_button.xml b/app/src/main/res/layout/layout_clear_permission_button.xml
index b65d9b52b..0ae473c19 100644
--- a/app/src/main/res/layout/layout_clear_permission_button.xml
+++ b/app/src/main/res/layout/layout_clear_permission_button.xml
@@ -1,12 +1,9 @@
-
diff --git a/app/src/main/res/layout/no_content_message_with_action.xml b/app/src/main/res/layout/no_content_message_with_action.xml
index 8a23bfd3d..90387cd43 100644
--- a/app/src/main/res/layout/no_content_message_with_action.xml
+++ b/app/src/main/res/layout/no_content_message_with_action.xml
@@ -35,17 +35,9 @@
diff --git a/app/src/main/res/layout/onboarding_finish.xml b/app/src/main/res/layout/onboarding_finish.xml
index 3a4049e3c..743ec0e39 100644
--- a/app/src/main/res/layout/onboarding_finish.xml
+++ b/app/src/main/res/layout/onboarding_finish.xml
@@ -3,17 +3,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+ android:text="@string/onboarding_finish" />
diff --git a/app/src/main/res/layout/onboarding_manual_signin.xml b/app/src/main/res/layout/onboarding_manual_signin.xml
index 0e8209453..303736255 100644
--- a/app/src/main/res/layout/onboarding_manual_signin.xml
+++ b/app/src/main/res/layout/onboarding_manual_signin.xml
@@ -23,20 +23,9 @@
tools:text="@string/onboarding_firefox_account_header" />
+ app:backgroundTint="@color/foundation_light_theme" />
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 058c29349..fd5ff4179 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -33,32 +33,14 @@
app:layout_constraintTop_toBottomOf="@id/header_text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
-
-
-
+
+
diff --git a/app/src/main/res/layout/onboarding_private_browsing.xml b/app/src/main/res/layout/onboarding_private_browsing.xml
index 372b0c3d6..7ead36e55 100644
--- a/app/src/main/res/layout/onboarding_private_browsing.xml
+++ b/app/src/main/res/layout/onboarding_private_browsing.xml
@@ -46,32 +46,13 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/open_settings_button" />
-
-
-
+ app:layout_constraintBottom_toBottomOf="parent"/>
diff --git a/app/src/main/res/layout/save_tab_group_button.xml b/app/src/main/res/layout/save_tab_group_button.xml
deleted file mode 100644
index e287f071c..000000000
--- a/app/src/main/res/layout/save_tab_group_button.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
diff --git a/app/src/main/res/layout/save_to_collection_button.xml b/app/src/main/res/layout/save_to_collection_button.xml
new file mode 100644
index 000000000..beac02f79
--- /dev/null
+++ b/app/src/main/res/layout/save_to_collection_button.xml
@@ -0,0 +1,12 @@
+
+
+
diff --git a/app/src/main/res/layout/search_suggestions_onboarding.xml b/app/src/main/res/layout/search_suggestions_onboarding.xml
index c4e3491e8..b4d3fdd55 100644
--- a/app/src/main/res/layout/search_suggestions_onboarding.xml
+++ b/app/src/main/res/layout/search_suggestions_onboarding.xml
@@ -61,7 +61,7 @@
@anim/fade_out
-
-
+
+
+
+