Update Settings text styles to use DeviceDefault.

- Replace all TextAppearance.Material styles with the equivalent
TextAppearance.DeviceDefault style
- Reparent Theme.Settings.HomeBase to inherit from Theme.Settings. This
ensures that the correct textAppearance theme attributes are applied
throughout the Settings application.

Bug: 121211932
Test: manually opening Settings and enabling/disabling HotDogOverlay
Change-Id: Ibe4873ed0294de79dbb6aeca464d14c291239c4b
This commit is contained in:
Amin Shaikh
2018-12-19 14:42:59 -05:00
parent 221b7e0b77
commit a5e8bddc46
44 changed files with 123 additions and 123 deletions

View File

@@ -28,7 +28,7 @@
android:layout_height="match_parent"> android:layout_height="match_parent">
<TextView <TextView
style="@android:style/TextAppearance.Material.Title" style="@*android:style/TextAppearance.DeviceDefault.Title"
android:id="@+id/headerText" android:id="@+id/headerText"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
@@ -38,7 +38,7 @@
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
<TextView <TextView
style="@android:style/TextAppearance.Material.Body1" style="@*android:style/TextAppearance.DeviceDefault.Body1"
android:id="@+id/detailsText" android:id="@+id/detailsText"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"

View File

@@ -37,7 +37,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
style="@android:style/TextAppearance.Material.Headline" style="@*android:style/TextAppearance.DeviceDefault.Headline"
android:id="@+id/headerText" android:id="@+id/headerText"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
@@ -46,7 +46,7 @@
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
<TextView <TextView
style="@android:style/TextAppearance.Material.Body1" style="@*android:style/TextAppearance.DeviceDefault.Body1"
android:id="@+id/detailsText" android:id="@+id/detailsText"
android:layout_marginStart="32dp" android:layout_marginStart="32dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
@@ -111,4 +111,4 @@
</LinearLayout> </LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</FrameLayout> </FrameLayout>

View File

@@ -42,7 +42,7 @@
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Display1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
android:textSize="36sp" /> android:textSize="36sp" />
<TextView <TextView
@@ -54,7 +54,7 @@
android:maxLines="10" android:maxLines="10"
android:paddingBottom="20dp" android:paddingBottom="20dp"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
<Button <Button
android:id="@+id/deletion_helper_button" android:id="@+id/deletion_helper_button"

View File

@@ -56,7 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<com.android.settings.widget.LabeledSeekBar <com.android.settings.widget.LabeledSeekBar
@@ -102,7 +102,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_summary" android:text="@string/font_size_summary"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

View File

@@ -56,7 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<com.android.settings.widget.LabeledSeekBar <com.android.settings.widget.LabeledSeekBar
@@ -102,7 +102,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/screen_zoom_summary" android:text="@string/screen_zoom_summary"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>

View File

@@ -42,7 +42,7 @@
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Display1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
android:textSize="36sp" /> android:textSize="36sp" />
<TextView <TextView
@@ -54,7 +54,7 @@
android:maxLines="10" android:maxLines="10"
android:paddingBottom="20dp" android:paddingBottom="20dp"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
<Button <Button
android:id="@+id/deletion_helper_button" android:id="@+id/deletion_helper_button"

View File

@@ -34,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/admin_details_dialog_padding" android:paddingStart="@dimen/admin_details_dialog_padding"
android:text="@string/disabled_by_policy_title" android:text="@string/disabled_by_policy_title"
android:textAppearance="@android:style/TextAppearance.Material.Title" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />
</LinearLayout> </LinearLayout>
<ScrollView <ScrollView
@@ -48,7 +48,7 @@
<TextView android:id="@+id/admin_support_msg" <TextView android:id="@+id/admin_support_msg"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:text="@string/default_admin_support_msg" android:text="@string/default_admin_support_msg"
android:maxLength="200" android:maxLength="200"
android:autoLink="email|phone|web" android:autoLink="email|phone|web"

View File

@@ -40,7 +40,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:textAppearance="@android:style/TextAppearance.Material.Display1"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"/>
<TextView <TextView
android:id="@+id/summary1" android:id="@+id/summary1"
@@ -48,13 +48,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:minLines="2" android:minLines="2"
android:textAppearance="@android:style/TextAppearance.Material.Small"/> android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
<TextView <TextView
android:id="@+id/summary2" android:id="@+id/summary2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Small"/> android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
</LinearLayout> </LinearLayout>

View File

@@ -40,7 +40,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/bluetooth_pairing_key_msg" android:text="@string/bluetooth_pairing_key_msg"
android:visibility="gone" android:visibility="gone"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="@color/bluetooth_dialog_text_color" /> android:textColor="@color/bluetooth_dialog_text_color" />
<TextView <TextView
@@ -52,7 +52,7 @@
android:layout_marginBottom="@dimen/bluetooth_dialog_padding" android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
android:gravity="center_vertical" android:gravity="center_vertical"
android:visibility="gone" android:visibility="gone"
android:textAppearance="@android:style/TextAppearance.Material.Headline" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline" />
<TextView <TextView
android:id="@+id/pairing_code_message" android:id="@+id/pairing_code_message"
@@ -63,7 +63,7 @@
android:layout_marginBottom="@dimen/bluetooth_dialog_padding" android:layout_marginBottom="@dimen/bluetooth_dialog_padding"
android:gravity="center_vertical" android:gravity="center_vertical"
android:text="@string/bluetooth_enter_passkey_msg" android:text="@string/bluetooth_enter_passkey_msg"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="@color/bluetooth_dialog_text_color" android:textColor="@color/bluetooth_dialog_text_color"
android:visibility="gone" /> android:visibility="gone" />
@@ -73,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bluetooth_dialog_padding" android:layout_marginStart="@dimen/bluetooth_dialog_padding"
android:layout_marginEnd="@dimen/bluetooth_dialog_padding" android:layout_marginEnd="@dimen/bluetooth_dialog_padding"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="@color/bluetooth_dialog_text_color" /> android:textColor="@color/bluetooth_dialog_text_color" />
</LinearLayout> </LinearLayout>

View File

@@ -60,7 +60,7 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:gravity="center" android:gravity="center"
android:paddingStart="@dimen/bluetooth_checkbox_padding" android:paddingStart="@dimen/bluetooth_checkbox_padding"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"/> android:textColor="?android:attr/textColorSecondary"/>
<TextView <TextView
@@ -71,7 +71,7 @@
android:layout_marginEnd="@dimen/bluetooth_pairing_padding" android:layout_marginEnd="@dimen/bluetooth_pairing_padding"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorSecondary"/> android:textColor="?android:attr/textColorSecondary"/>
<CheckBox <CheckBox
@@ -84,7 +84,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingStart="@dimen/bluetooth_checkbox_padding" android:paddingStart="@dimen/bluetooth_checkbox_padding"
android:text="@string/bluetooth_pairing_shares_phonebook" android:text="@string/bluetooth_pairing_shares_phonebook"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"/> android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout> </LinearLayout>

View File

@@ -26,5 +26,5 @@
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorAlertDialogListItem" /> android:textColor="?android:attr/textColorAlertDialogListItem" />

View File

@@ -31,7 +31,7 @@
android:paddingTop="@dimen/confirm_credentials_top_padding"> android:paddingTop="@dimen/confirm_credentials_top_padding">
<TextView <TextView
style="@android:style/TextAppearance.Material.Headline" style="@*android:style/TextAppearance.DeviceDefault.Headline"
android:id="@+id/headerText" android:id="@+id/headerText"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
@@ -41,7 +41,7 @@
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
<TextView <TextView
style="@android:style/TextAppearance.Material.Body1" style="@*android:style/TextAppearance.DeviceDefault.Body1"
android:id="@+id/detailsText" android:id="@+id/detailsText"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"

View File

@@ -40,7 +40,7 @@
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
style="@android:style/TextAppearance.Material.Headline" style="@*android:style/TextAppearance.DeviceDefault.Headline"
android:id="@+id/headerText" android:id="@+id/headerText"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"
@@ -50,7 +50,7 @@
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
<TextView <TextView
style="@android:style/TextAppearance.Material.Body1" style="@*android:style/TextAppearance.DeviceDefault.Body1"
android:id="@+id/detailsText" android:id="@+id/detailsText"
android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginStart="?attr/confirmDeviceCredentialsSideMargin"
android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin" android:layout_marginEnd="?attr/confirmDeviceCredentialsSideMargin"

View File

@@ -64,14 +64,14 @@
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="@string/data_usage_label_foreground" android:text="@string/data_usage_label_foreground"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView
android:id="@+id/app_foreground" android:id="@+id/app_foreground"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewEnd" /> android:textAlignment="viewEnd" />
</LinearLayout> </LinearLayout>
@@ -87,14 +87,14 @@
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:text="@string/data_usage_label_background" android:text="@string/data_usage_label_background"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView
android:id="@+id/app_background" android:id="@+id/app_background"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewEnd" /> android:textAlignment="viewEnd" />
</LinearLayout> </LinearLayout>

View File

@@ -48,7 +48,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<LinearLayout <LinearLayout
@@ -94,7 +94,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_summary" android:text="@string/font_size_summary"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

View File

@@ -36,25 +36,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_headline" android:text="@string/font_size_preview_text_headline"
android:textAppearance="@android:style/TextAppearance.Material.Headline"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_title" android:text="@string/font_size_preview_text_title"
android:textAppearance="@android:style/TextAppearance.Material.Title"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_subtitle" android:text="@string/font_size_preview_text_subtitle"
android:textAppearance="@android:style/TextAppearance.Material.Subhead"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/font_size_preview_text_body" android:text="@string/font_size_preview_text_body"
android:textAppearance="@android:style/TextAppearance.Material.Body1"/> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>
</LinearLayout> </LinearLayout>
</view> </view>
</ScrollView> </ScrollView>

View File

@@ -35,7 +35,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" /> android:fadingEdge="horizontal" />
@@ -48,7 +48,7 @@
android:layout_alignStart="@android:id/title" android:layout_alignStart="@android:id/title"
android:visibility="gone" android:visibility="gone"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" /> android:maxLines="10" />

View File

@@ -34,7 +34,7 @@
android:id="@android:id/title" android:id="@android:id/title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" /> android:fadingEdge="horizontal" />
@@ -47,7 +47,7 @@
android:layout_alignStart="@android:id/title" android:layout_alignStart="@android:id/title"
android:visibility="gone" android:visibility="gone"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" /> android:maxLines="10" />

View File

@@ -46,7 +46,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="start|center" android:layout_gravity="start|center"
android:textAppearance="@android:style/TextAppearance.Material.Body2" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:textColor="?android:attr/colorAccent"/> android:textColor="?android:attr/colorAccent"/>
<ProgressBar <ProgressBar

View File

@@ -58,7 +58,7 @@
android:layout_weight="1" android:layout_weight="1"
android:paddingStart="12dp" android:paddingStart="12dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal"/> android:fadingEdge="horizontal"/>
@@ -94,7 +94,7 @@
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:visibility="gone" android:visibility="gone"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary"/> android:textColor="?android:attr/textColorSecondary"/>
</LinearLayout> </LinearLayout>

View File

@@ -35,7 +35,7 @@
android:paddingStart="56dp" android:paddingStart="56dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView

View File

@@ -44,6 +44,6 @@
android:maxLines="2" android:maxLines="2"
android:minLines="2" android:minLines="2"
android:gravity="top|center_horizontal" android:gravity="top|center_horizontal"
android:textAppearance="@android:style/TextAppearance.Material.Body1" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
</LinearLayout> </LinearLayout>

View File

@@ -36,7 +36,7 @@
android:paddingStart="32dp" android:paddingStart="32dp"
android:gravity="start|center" android:gravity="start|center"
android:text="@string/screen_zoom_preview_title" android:text="@string/screen_zoom_preview_title"
android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
android:importantForAccessibility="no" /> android:importantForAccessibility="no" />
</LinearLayout> </LinearLayout>

View File

@@ -30,7 +30,7 @@
android:layout_height="48dp" android:layout_height="48dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Body2" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
@@ -63,7 +63,7 @@
<TextView <TextView
android:id="@+id/systemSizePrefix" android:id="@+id/systemSizePrefix"
android:text="@string/running_processes_header_system_prefix" android:text="@string/running_processes_header_system_prefix"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -81,7 +81,7 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/systemSize" android:id="@+id/systemSize"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -108,7 +108,7 @@
<TextView <TextView
android:id="@+id/appsSizePrefix" android:id="@+id/appsSizePrefix"
android:text="@string/running_processes_header_apps_prefix" android:text="@string/running_processes_header_apps_prefix"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -126,7 +126,7 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/appsSize" android:id="@+id/appsSize"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -153,7 +153,7 @@
<TextView <TextView
android:id="@+id/freeSizePrefix" android:id="@+id/freeSizePrefix"
android:text="@string/running_processes_header_free_prefix" android:text="@string/running_processes_header_free_prefix"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -171,7 +171,7 @@
android:contentDescription="@null" /> android:contentDescription="@null" />
<TextView <TextView
android:id="@+id/freeSize" android:id="@+id/freeSize"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -186,7 +186,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Body2" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:gravity="left|center_vertical" android:gravity="left|center_vertical"

View File

@@ -48,7 +48,7 @@
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true" android:singleLine="true"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView
@@ -56,7 +56,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
@@ -70,7 +70,7 @@
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
@@ -79,7 +79,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>

View File

@@ -48,7 +48,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:padding="6dp" android:padding="6dp"
android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:elevation="2dp" /> android:elevation="2dp" />
<LinearLayout <LinearLayout
@@ -93,7 +93,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/screen_zoom_summary" android:text="@string/screen_zoom_summary"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

View File

@@ -37,5 +37,5 @@
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_horizontal|top" android:gravity="center_horizontal|top"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Caption" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption" />
</LinearLayout> </LinearLayout>

View File

@@ -57,7 +57,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_settings" android:text="@string/wifi_settings"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
@@ -65,7 +65,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/wifi_display_status_not_available" android:text="@string/wifi_display_status_not_available"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -96,14 +96,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/data_usage_summary_title" android:text="@string/data_usage_summary_title"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/no_data_usage" android:text="@string/no_data_usage"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -134,14 +134,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/display_settings_title" android:text="@string/display_settings_title"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/display_summary_example" android:text="@string/display_summary_example"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -172,14 +172,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sound_settings" android:text="@string/sound_settings"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/sound_settings_example_summary" android:text="@string/sound_settings_example_summary"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -210,14 +210,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/applications_settings" android:text="@string/applications_settings"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/apps_summary_example" android:text="@string/apps_summary_example"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -31,7 +31,7 @@
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:paddingTop="0dp" android:paddingTop="0dp"
android:textColor="?android:attr/colorAccent" android:textColor="?android:attr/colorAccent"
android:textAppearance="@android:style/TextAppearance.Material.Display1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
/> />
<TextView android:id="@android:id/summary" <TextView android:id="@android:id/summary"

View File

@@ -33,7 +33,7 @@
android:paddingStart="@dimen/suw_layout_margin_sides" android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides" android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
</ScrollView> </ScrollView>

View File

@@ -33,7 +33,7 @@
android:paddingStart="@dimen/suw_layout_margin_sides" android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides" android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
</ScrollView> </ScrollView>

View File

@@ -33,7 +33,7 @@
android:paddingStart="@dimen/suw_layout_margin_sides" android:paddingStart="@dimen/suw_layout_margin_sides"
android:paddingEnd="@dimen/suw_layout_margin_sides" android:paddingEnd="@dimen/suw_layout_margin_sides"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra" android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorPrimary" /> android:textColor="?android:attr/textColorPrimary" />
</ScrollView> </ScrollView>

View File

@@ -61,7 +61,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" /> android:fadingEdge="horizontal" />
@@ -71,7 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" android:maxLines="10"
android:layout_alignParentEnd="true"/> android:layout_alignParentEnd="true"/>

View File

@@ -35,7 +35,7 @@
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/colorAccent" android:textColor="?android:attr/colorAccent"
android:textSize="36sp"/> android:textSize="36sp"/>
@@ -44,7 +44,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:maxLines="10" /> android:maxLines="10" />
<ProgressBar <ProgressBar

View File

@@ -32,7 +32,7 @@
android:fontFamily="@*android:string/config_headlineFontFamily" android:fontFamily="@*android:string/config_headlineFontFamily"
android:singleLine="true" android:singleLine="true"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Display1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Display1"
android:textSize="36sp" /> android:textSize="36sp" />
<TextView <TextView
@@ -43,7 +43,7 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:maxLines="10" android:maxLines="10"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@android:style/TextAppearance.Material.Body1" /> android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" />
<com.android.settings.widget.DonutView <com.android.settings.widget.DonutView
android:id="@+id/donut" android:id="@+id/donut"

View File

@@ -48,7 +48,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom" android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:text="@string/storage_wizard_init_v2_internal_title" /> android:text="@string/storage_wizard_init_v2_internal_title" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -115,7 +115,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/suw_description_margin_bottom" android:layout_marginBottom="@dimen/suw_description_margin_bottom"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:text="@string/storage_wizard_init_v2_external_title" /> android:text="@string/storage_wizard_init_v2_external_title" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dip" android:layout_marginBottom="16dip"
android:textAppearance="@android:style/TextAppearance.Material.Body2" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body2"
android:textColor="?android:attr/colorAccent" android:textColor="?android:attr/colorAccent"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

View File

@@ -18,5 +18,5 @@
android:id="@android:id/summary" android:id="@android:id/summary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:padding="16dip" /> android:padding="16dip" />

View File

@@ -26,7 +26,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_gravity="fill_horizontal|top" android:layout_gravity="fill_horizontal|top"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:singleLine="true" android:singleLine="true"
@@ -40,7 +40,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_marginStart="8dip" android:layout_marginStart="8dip"
android:layout_gravity="fill_horizontal|top" android:layout_gravity="fill_horizontal|top"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAlignment="viewEnd" android:textAlignment="viewEnd"
android:singleLine="true" android:singleLine="true"

View File

@@ -32,7 +32,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/zen_onboarding_dnd_visual_disturbances_header" android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" /> android:textAppearance="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle" />
<LinearLayout <LinearLayout
android:id="@+id/zen_onboarding_new_setting" android:id="@+id/zen_onboarding_new_setting"

View File

@@ -42,7 +42,7 @@
android:singleLine="true" android:singleLine="true"
android:textSize="16sp" android:textSize="16sp"
android:ellipsize="marquee" android:ellipsize="marquee"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:fadingEdge="horizontal" /> android:fadingEdge="horizontal" />
<TextView android:id="@+id/subtitle" <TextView android:id="@+id/subtitle"
@@ -52,7 +52,7 @@
android:layout_alignStart="@id/title" android:layout_alignStart="@id/title"
android:textSize="14sp" android:textSize="14sp"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:maxLines="2" android:maxLines="2"
android:visibility="gone" /> android:visibility="gone" />

View File

@@ -121,7 +121,7 @@
<item name="android:paddingStart">8dip</item> <item name="android:paddingStart">8dip</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item> <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body1</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
@@ -129,13 +129,13 @@
<item name="android:paddingStart">8dip</item> <item name="android:paddingStart">8dip</item>
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item> <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body1</item>
<item name="android:textColor">?android:attr/colorError</item> <item name="android:textColor">?android:attr/colorError</item>
</style> </style>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item> <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Subhead</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:minHeight">@dimen/min_tap_target_size</item> <item name="android:minHeight">@dimen/min_tap_target_size</item>
</style> </style>
@@ -189,13 +189,13 @@
<style name="vpn_label"> <style name="vpn_label">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Small</item>
</style> </style>
<style name="vpn_value"> <style name="vpn_value">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:minHeight">@dimen/min_tap_target_size</item> <item name="android:minHeight">@dimen/min_tap_target_size</item>
@@ -205,10 +205,10 @@
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:paddingStart">8dip</item> <item name="android:paddingStart">8dip</item>
<item name="android:textAppearance">?android:attr/textAppearanceSmall</item> <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Small</item>
</style> </style>
<style name="TextAppearance" parent="android:TextAppearance.Material"/> <style name="TextAppearance" parent="android:TextAppearance.DeviceDefault"/>
<style name="TextAppearance.info_label"> <style name="TextAppearance.info_label">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
@@ -225,14 +225,14 @@
<item name="android:textStyle">normal</item> <item name="android:textStyle">normal</item>
</style> </style>
<style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.Material"> <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance.DeviceDefault">
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:singleLine">true</item> <item name="android:singleLine">true</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">24sp</item> <item name="android:textSize">24sp</item>
</style> </style>
<style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.Material"> <style name="TextAppearance.CryptKeeper_PasswordEntry" parent="android:TextAppearance.DeviceDefault">
<item name="android:gravity">center_horizontal</item> <item name="android:gravity">center_horizontal</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:textCursorDrawable">@null</item> <item name="android:textCursorDrawable">@null</item>
@@ -240,22 +240,22 @@
<item name="android:imeOptions">flagForceAscii|actionDone</item> <item name="android:imeOptions">flagForceAscii|actionDone</item>
</style> </style>
<style name="TextAppearance.Medium" parent="@android:style/TextAppearance.Material.Medium"/> <style name="TextAppearance.Medium" parent="@android:style/TextAppearance.DeviceDefault.Medium"/>
<style name="TextAppearance.Small" parent="@android:style/TextAppearance.Material.Small"/> <style name="TextAppearance.Small" parent="@android:style/TextAppearance.DeviceDefault.Small"/>
<style name="TextAppearance.Switch" <style name="TextAppearance.Switch"
parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"> parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="TextAppearance.CategoryTitle" <style name="TextAppearance.CategoryTitle"
parent="@android:style/TextAppearance.Material.Body2"> parent="@*android:style/TextAppearance.DeviceDefault.Body2">
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Subhead"/> <style name="TextAppearance.TileTitle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead"/>
<style name="TextAppearance.SuggestionTitle" <style name="TextAppearance.SuggestionTitle"
parent="@android:style/TextAppearance.Material.Subhead"> parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
@@ -264,7 +264,7 @@
</style> </style>
<style name="TextAppearance.ErrorText" <style name="TextAppearance.ErrorText"
parent="android:TextAppearance.Material.Body1"> parent="@*android:TextAppearance.DeviceDefault.Body1">
<item name="android:textColor">?android:attr/colorError</item> <item name="android:textColor">?android:attr/colorError</item>
</style> </style>
@@ -274,29 +274,29 @@
</style> </style>
<style name="TextAppearance.RemoveDialogContent" <style name="TextAppearance.RemoveDialogContent"
parent="@android:style/TextAppearance.Material"> parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>
<style name="TextAppearance.SearchBar" <style name="TextAppearance.SearchBar"
parent="@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle"> parent="@*android:style/TextAppearance.DeviceDefault.Widget.Toolbar.Subtitle">
<item name="android:textSize">@dimen/search_bar_text_size</item> <item name="android:textSize">@dimen/search_bar_text_size</item>
</style> </style>
<style name="TextAppearance.SuggestionHeader" <style name="TextAppearance.SuggestionHeader"
parent="@android:style/TextAppearance.Material.Subhead"> parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/colorAccent</item> <item name="android:textColor">?android:attr/colorAccent</item>
</style> </style>
<style name="TextAppearance.ConditionCardTitle" <style name="TextAppearance.ConditionCardTitle"
parent="@android:style/TextAppearance.Material.Body2"> parent="@*android:style/TextAppearance.DeviceDefault.Body2">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="TextAppearance.ConditionCardSummary" <style name="TextAppearance.ConditionCardSummary"
parent="@android:style/TextAppearance.Material.Body1"> parent="@*android:style/TextAppearance.DeviceDefault.Body1">
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
@@ -311,7 +311,7 @@
</style> </style>
<style name="TextAppearance.ContextualCardDismissalText" <style name="TextAppearance.ContextualCardDismissalText"
parent="@android:style/TextAppearance.Material.Body1"> parent="@*android:style/TextAppearance.DeviceDefault.Body1">
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item> <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
@@ -350,13 +350,13 @@
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center_vertical</item>
</style> </style>
<style name="FingerprintHeaderStyle" parent="android:style/TextAppearance.Material.Subhead"> <style name="FingerprintHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:paddingTop">16dp</item> <item name="android:paddingTop">16dp</item>
<item name="android:textColor">@color/primary_dark_material_light</item> <item name="android:textColor">@color/primary_dark_material_light</item>
<item name="android:lineSpacingMultiplier">1.2</item> <item name="android:lineSpacingMultiplier">1.2</item>
</style> </style>
<style name="FaceHeaderStyle" parent="android:style/TextAppearance.Material.Subhead"> <style name="FaceHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:paddingTop">16dp</item> <item name="android:paddingTop">16dp</item>
<item name="android:textColor">@color/primary_dark_material_light</item> <item name="android:textColor">@color/primary_dark_material_light</item>
<item name="android:lineSpacingMultiplier">1.2</item> <item name="android:lineSpacingMultiplier">1.2</item>
@@ -411,13 +411,13 @@
<style name="device_info_dialog_label"> <style name="device_info_dialog_label">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item> <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body1</item>
<item name="android:textColor">?android:attr/textColorSecondary</item> <item name="android:textColor">?android:attr/textColorSecondary</item>
</style> </style>
<style name="device_info_dialog_value"> <style name="device_info_dialog_value">
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body2</item> <item name="android:textAppearance">@*android:style/TextAppearance.DeviceDefault.Body2</item>
<item name="android:paddingBottom">24dp</item> <item name="android:paddingBottom">24dp</item>
</style> </style>

View File

@@ -180,7 +180,7 @@
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </style>
<style name="Theme.Settings.HomeBase" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="Theme.Settings.HomeBase" parent="Theme.Settings.NoActionBar">
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item> <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item> <item name="colorAccent">@*android:color/accent_device_default_light</item>
<item name="preferenceTheme">@style/PreferenceTheme</item> <item name="preferenceTheme">@style/PreferenceTheme</item>

View File

@@ -30,7 +30,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Material.Subhead" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" /> android:fadingEdge="horizontal" />
@@ -43,7 +43,7 @@
android:layout_alignStart="@android:id/title" android:layout_alignStart="@android:id/title"
android:visibility="gone" android:visibility="gone"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" /> android:maxLines="10" />