1
0
Fork 0

For #6317 - Applies 3dot menuItem look to quickSettings and tracking panel

master
codrut.topliceanu 2020-02-11 12:51:59 +02:00 committed by Emily Kager
parent f8048462b5
commit 9059a6b465
3 changed files with 47 additions and 24 deletions

View File

@ -54,7 +54,7 @@
<TextView
android:id="@+id/cross_site_tracking"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cookies_title"
@ -64,7 +64,7 @@
<TextView
android:id="@+id/fingerprinters"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_fingerprinters_title"
@ -74,7 +74,7 @@
<TextView
android:id="@+id/cryptominers"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cryptominers_title"
@ -84,7 +84,7 @@
<TextView
android:id="@+id/social_media_trackers"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_social_media_trackers_title"
@ -94,7 +94,7 @@
<TextView
android:id="@+id/tracking_content"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_tracking_content_title"
@ -115,7 +115,7 @@
<TextView
android:id="@+id/fingerprinters_loaded"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_fingerprinters_title"
@ -125,7 +125,7 @@
<TextView
android:id="@+id/cryptominers_loaded"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_cryptominers_title"
@ -135,7 +135,7 @@
<TextView
android:id="@+id/social_media_trackers_loaded"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_social_media_trackers_title"
@ -145,7 +145,7 @@
<TextView
android:id="@+id/tracking_content_loaded"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:text="@string/etp_tracking_content_title"
@ -162,7 +162,7 @@
<TextView
android:id="@+id/protection_settings"
style="@style/QuickSettingsText.Icon"
style="@style/QuickSettingsLargeText.Icon"
android:layout_width="match_parent"
android:layout_height="@dimen/tracking_protection_item_height"
android:paddingEnd="24dp"
@ -188,6 +188,7 @@
app:layout_constraintBottom_toBottomOf="@+id/category_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/category_title"
app:layout_constraintVertical_bias="0.0"
app:srcCompat="@drawable/mozac_ic_back" />
<TextView
@ -253,6 +254,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="52dp"
android:layout_marginEnd="26dp"
android:lineSpacingMultiplier="1.2"
android:layout_marginBottom="12dp"
tools:text="@tools:sample/lorem/random" />
</androidx.core.widget.NestedScrollView>

View File

@ -12,26 +12,34 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/title"
style="@style/QuickSettingsText"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textStyle="bold"
tools:text="Wikipedia" />
android:orientation="vertical"
android:minHeight="@dimen/tracking_protection_item_height">
<TextView
android:id="@+id/url"
style="@style/QuickSettingsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
tools:text="https://wikipedia.org" />
<TextView
android:id="@+id/title"
style="@style/QuickSettingsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:textStyle="bold"
tools:text="Wikipedia" />
<TextView
android:id="@+id/url"
style="@style/QuickSettingsText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="8dp"
tools:text="https://wikipedia.org" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/tracking_protection_item_height"
android:orientation="horizontal"
style="@style/QuickSettingsText"
android:paddingTop="8dp"
@ -49,7 +57,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/securityInfo"
style="@style/QuickSettingsText"
style="@style/QuickSettingsLargeText"
android:layout_width="match_parent"
android:paddingStart="0dp"
android:layout_height="wrap_content"

View File

@ -318,6 +318,19 @@
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="QuickSettingsLargeText">
<item name="android:textColor">@color/state_list_text_color</item>
<item name="android:textSize">16sp</item>
<item name="android:paddingStart">16dp</item>
<item name="android:paddingEnd">16dp</item>
<item name="android:gravity">center_vertical</item>
<item name="android:layout_alignParentStart">true</item>
</style>
<style name="QuickSettingsLargeText.Icon">
<item name="android:drawablePadding">8dp</item>
</style>
<style name="QuickSettingsText.Icon">
<item name="android:drawablePadding">8dp</item>
</style>