blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #8190: Add animation to ETP policy selection

master
mcarare 2020-02-07 12:11:23 +02:00 committed by Jeff Boek
parent 88ed1e4815
commit 3ea5b08135
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
View File

@ -54,10 +54,7 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
updateTrackingProtectionPolicy() updateTrackingProtectionPolicy()
} }
view.protection_standard_title.setOnClickListener { view.clickable_region_standard.setOnClickListener {
standardTrackingProtection.performClick()
}
view.protection_standard_description.setOnClickListener {
standardTrackingProtection.performClick() standardTrackingProtection.performClick()
} }
@ -65,11 +62,7 @@ class OnboardingTrackingProtectionViewHolder(view: View) : RecyclerView.ViewHold
updateTrackingProtectionPolicy() updateTrackingProtectionPolicy()
} }
view.protection_strict_title.setOnClickListener { view.clickable_region_strict.setOnClickListener {
strictTrackingProtection.performClick()
}
view.protection_strict_description.setOnClickListener {
strictTrackingProtection.performClick() strictTrackingProtection.performClick()
} }
} }

21
app/src/main/res/layout/onboarding_tracking_protection.xml
View File

@ -42,6 +42,16 @@
app:layout_constraintTop_toBottomOf="@id/header_text" app:layout_constraintTop_toBottomOf="@id/header_text"
tools:text="@string/onboarding_tracking_protection_description1" /> tools:text="@string/onboarding_tracking_protection_description1" />
<View
android:id="@+id/clickable_region_standard"
android:layout_width="match_parent"
android:layout_height="0dp"
android:foreground="@drawable/rounded_ripple"
app:layout_constraintBottom_toBottomOf="@id/protection_standard_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tracking_protection_standard_option" />
<org.mozilla.fenix.onboarding.OnboardingRadioButton <org.mozilla.fenix.onboarding.OnboardingRadioButton
android:id="@+id/tracking_protection_standard_option" android:id="@+id/tracking_protection_standard_option"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,6 +86,16 @@
app:layout_constraintStart_toStartOf="@+id/protection_standard_title" app:layout_constraintStart_toStartOf="@+id/protection_standard_title"
app:layout_constraintTop_toBottomOf="@id/protection_standard_title" /> app:layout_constraintTop_toBottomOf="@id/protection_standard_title" />
<View
android:id="@+id/clickable_region_strict"
android:layout_width="match_parent"
android:layout_height="0dp"
android:foreground="@drawable/rounded_ripple"
app:layout_constraintBottom_toBottomOf="@id/protection_strict_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/tracking_protection_strict_default" />
<org.mozilla.fenix.onboarding.OnboardingRadioButton <org.mozilla.fenix.onboarding.OnboardingRadioButton
android:id="@+id/tracking_protection_strict_default" android:id="@+id/tracking_protection_strict_default"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -112,5 +132,4 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/protection_strict_title" app:layout_constraintStart_toStartOf="@+id/protection_strict_title"
app:layout_constraintTop_toBottomOf="@id/protection_strict_title" /> app:layout_constraintTop_toBottomOf="@id/protection_strict_title" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>