parent
048d22dbcf
commit
03726384de
|
@ -9,7 +9,7 @@
|
||||||
android:color="?neutralFaded" />
|
android:color="?neutralFaded" />
|
||||||
<gradient
|
<gradient
|
||||||
android:angle="45"
|
android:angle="45"
|
||||||
android:endColor="@color/accent_high_contrast_dark_theme"
|
android:endColor="?onboardingDarkGradientEndBackground"
|
||||||
android:startColor="@color/accent_bright_dark_theme" />
|
android:startColor="?onboardingDarkGradientStartBackground" />
|
||||||
<corners android:radius="8dp" />
|
<corners android:radius="8dp" />
|
||||||
</shape>
|
</shape>
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle">
|
android:shape="rectangle">
|
||||||
<stroke android:width="1dp" android:color="?neutralFaded" />
|
<stroke android:width="1dp" android:color="?neutralFaded" />
|
||||||
<solid android:color="?inset" />
|
<solid android:color="?above" />
|
||||||
<corners android:radius="8dp" />
|
<corners android:radius="8dp" />
|
||||||
</shape>
|
</shape>
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
<stroke
|
<stroke
|
||||||
android:width="1dp"
|
android:width="1dp"
|
||||||
android:color="?neutralFaded" />
|
android:color="?neutralFaded" />
|
||||||
<solid android:color="?inset" />
|
<solid android:color="?above" />
|
||||||
<corners
|
<corners
|
||||||
android:bottomLeftRadius="@dimen/tab_corner_radius"
|
android:bottomLeftRadius="@dimen/tab_corner_radius"
|
||||||
android:bottomRightRadius="@dimen/tab_corner_radius" />
|
android:bottomRightRadius="@dimen/tab_corner_radius" />
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
- 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/. -->
|
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||||
<Button xmlns:android="http://schemas.android.com/apk/res/android"
|
<Button xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
style="@style/PositiveButton"
|
style="@style/FinishOnboardingButton"
|
||||||
android:id="@+id/finish_button"
|
android:id="@+id/finish_button"
|
||||||
android:layout_marginBottom="16dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:text="@string/onboarding_finish" />
|
android:text="@string/onboarding_finish" />
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/onboarding_card"
|
android:id="@+id/onboarding_card"
|
||||||
style="@style/OnboardingCardLight"
|
style="@style/OnboardingCardLightWithPadding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/onboarding_card"
|
android:id="@+id/onboarding_card"
|
||||||
style="@style/OnboardingCardLight"
|
style="@style/OnboardingCardLightWithPadding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/onboarding_card"
|
android:id="@+id/onboarding_card"
|
||||||
style="@style/OnboardingCardLight"
|
style="@style/OnboardingCardLightWithPadding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:layout_constraintBottom_toBottomOf="@id/header_text"
|
app:layout_constraintBottom_toBottomOf="@id/header_text"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
android:theme="@style/Switch.Colored"
|
||||||
app:layout_constraintTop_toTopOf="@id/header_text" />
|
app:layout_constraintTop_toTopOf="@id/header_text" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -63,6 +64,7 @@
|
||||||
android:paddingEnd="8dp"
|
android:paddingEnd="8dp"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/description_text"
|
app:layout_constraintTop_toBottomOf="@id/description_text"
|
||||||
|
android:buttonTint="@color/onboarding_radio_button_color"
|
||||||
app:onboardingKey="@string/pref_key_tracking_protection_standard_option" />
|
app:onboardingKey="@string/pref_key_tracking_protection_standard_option" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -109,6 +111,7 @@
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tracking_protection_standard_option"
|
app:layout_constraintTop_toBottomOf="@id/tracking_protection_standard_option"
|
||||||
|
android:buttonTint="@color/onboarding_radio_button_color"
|
||||||
app:onboardingKey="@string/pref_key_tracking_protection_strict_default" />
|
app:onboardingKey="@string/pref_key_tracking_protection_strict_default" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:id="@+id/onboarding_card"
|
android:id="@+id/onboarding_card"
|
||||||
style="@style/OnboardingCardLight"
|
style="@style/OnboardingCardLightWithPadding"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<TextView
|
<TextView
|
||||||
|
|
Loading…
Reference in New Issue