blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Merge #5976 #5999 

5976: No issue: Update androidx fragment Oct 11 r=boek a=ekager



5999: For #5709: Align ETP Settings Screen implementation with original mocks r=NotWoods a=mcarare



Co-authored-by: ekager <emilykager@gmail.com>
Co-authored-by: mcarare <mihai.carare.dev@gmail.com>
master
MozLando 2019-10-14 19:28:43 +00:00
parent a918c4552f 4d771813b4 b1dcc69e52
commit 26b7c84749
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/preference_widget_radiobutton_with_info.xml
View File

@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginStart="42dp"
android:layout_marginStart="66dp"
android:background="@android:color/transparent"
android:button="@null"
android:clickable="false"
@ -55,6 +55,8 @@
android:id="@+id/vertical_divider"
android:layout_width="1dp"
android:layout_height="0dp"
android:paddingStart="1dp"
android:paddingEnd="1dp"
android:background="?neutralFaded"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/info_button"

6
app/src/main/res/layout/tracking_protection_learn_more_preference.xml
View File

@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:paddingTop="20dp"
android:background="#FF0250BB">
<ImageView
@ -25,6 +24,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:paddingTop="20dp"
android:ellipsize="none"
android:letterSpacing="0.05"
android:scrollHorizontally="false"
@ -46,7 +46,7 @@
android:scrollHorizontally="false"
android:text="@string/preference_enhanced_tracking_protection_explanation"
android:textColor="@color/primary_text_dark_theme"
android:textSize="12sp"
android:textSize="14sp"
app:layout_constraintBottom_toTopOf="@id/learn_more"
app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintHorizontal_bias="0.5"
@ -61,7 +61,7 @@
android:ellipsize="none"
android:text="@string/preference_enhanced_tracking_protection_explanation_learn_more"
android:textColor="@color/primary_text_dark_theme"
android:textSize="12sp"
android:textSize="14sp"
app:layout_constraintEnd_toStartOf="@id/guideline"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@android:id/title"

2
buildSrc/src/main/java/Dependencies.kt
View File

@ -24,7 +24,7 @@ object Versions {
const val androidx_legacy = "1.0.0"
const val androidx_annotation = "1.1.0"
const val androidx_lifecycle = "2.2.0-beta01"
const val androidx_fragment = "1.2.0-beta01"
const val androidx_fragment = "1.2.0-beta02"
const val androidx_navigation = "2.2.0-beta01"
const val androidx_recyclerview = "1.1.0-beta05"
const val androidx_testing = "1.2.1-alpha02"