Merge "Style tweaks for resolver empty state." into tm-dev
This commit is contained in:
@@ -36,8 +36,9 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:fontFamily="@string/config_headlineFontFamilyMedium"
|
||||
android:textColor="@color/resolver_empty_state_text"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:textSize="18sp"
|
||||
android:lineHeight="24sp"
|
||||
android:gravity="center_horizontal"
|
||||
android:layout_centerHorizontal="true" />
|
||||
<TextView
|
||||
@@ -46,8 +47,9 @@
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/resolver_empty_state_text"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textSize="14sp"
|
||||
android:lineHeight="20sp"
|
||||
android:gravity="center_horizontal"
|
||||
android:layout_centerHorizontal="true" />
|
||||
<Button
|
||||
@@ -57,11 +59,13 @@
|
||||
android:text="@string/resolver_switch_on_work"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="12dp"
|
||||
android:fontFamily="@string/config_headlineFontFamilyMedium"
|
||||
android:textSize="14sp"
|
||||
android:textColor="?attr/colorAccent"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:background="@drawable/resolver_turn_on_work_button_ripple_background"/>
|
||||
android:background="@drawable/chooser_action_button_bg"
|
||||
/>
|
||||
<ProgressBar
|
||||
android:id="@+id/resolver_empty_state_progress"
|
||||
style="@style/Widget.Material.Light.ProgressBar"
|
||||
|
||||
@@ -26,9 +26,6 @@
|
||||
<color name="chooser_gradient_background">@color/loading_gradient_background_color_dark</color>
|
||||
<color name="chooser_gradient_highlight">@color/loading_gradient_highlight_color_dark</color>
|
||||
|
||||
<color name="resolver_empty_state_text">#FFFFFF</color>
|
||||
<color name="resolver_empty_state_icon">#FFFFFF</color>
|
||||
|
||||
<color name="call_notification_decline_color">#E66A5E</color>
|
||||
<color name="call_notification_answer_color">#5DBA80</color>
|
||||
|
||||
|
||||
@@ -235,8 +235,6 @@
|
||||
|
||||
<!-- Resolver/Chooser -->
|
||||
<color name="resolver_text_color_secondary_dark">#ffC4C6C6</color>
|
||||
<color name="resolver_empty_state_text">#FF202124</color>
|
||||
<color name="resolver_empty_state_icon">#FF5F6368</color>
|
||||
|
||||
<!-- Color for personal app suspension notification button text and icon tint. -->
|
||||
<color name="personal_apps_suspension_notification_color">#1A73E8</color>
|
||||
|
||||
Reference in New Issue
Block a user