summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shubham Basu <basushubham@google.com> 2021-08-17 16:57:44 -0700
committer Shubham Basu <basushubham@google.com> 2021-08-17 23:59:32 +0000
commit417a44183bc339061d1e06fa7a968396ec753b28 (patch)
tree191b3e84d32a7e0aa45ccfc1f87d9d3a894c9a48
parent840737275fb301757521ac2f6c3673d609976135 (diff)
fix: work profile material next change
Bug: 195281572 Test: Manual Screenshots: https://screenshot.googleplex.com/8oQPyCc4bv6Sm7x.png https://screenshot.googleplex.com/4hh7uqCWsNs3MRj.png https://screenshot.googleplex.com/6sKgN9zRnnk4xHP.png https://screenshot.googleplex.com/R4RqLnxud7j39SY.png Change-Id: I069baf920a4a7c3722115fc627cd2eab7b11b3ed
-rw-r--r--res/layout/item_doc_inflated_message_cross_profile.xml2
-rw-r--r--res/values-night-v31/colors.xml4
-rw-r--r--res/values-night-v31/styles.xml7
-rw-r--r--res/values-v31/colors.xml9
-rw-r--r--res/values-v31/dimens.xml1
-rw-r--r--res/values-v31/styles.xml2
-rw-r--r--res/values-v31/styles_text.xml8
-rw-r--r--res/values/dimens.xml1
8 files changed, 25 insertions, 9 deletions
diff --git a/res/layout/item_doc_inflated_message_cross_profile.xml b/res/layout/item_doc_inflated_message_cross_profile.xml
index 520d39812..3cc0d7ce2 100644
--- a/res/layout/item_doc_inflated_message_cross_profile.xml
+++ b/res/layout/item_doc_inflated_message_cross_profile.xml
@@ -55,7 +55,7 @@
android:textAppearance="@style/EmptyStateTitleText"/>
<TextView
android:id="@+id/message"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="@dimen/cross_profile_button_message_margin_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
index b37507879..64bbaa229 100644
--- a/res/values-night-v31/colors.xml
+++ b/res/values-night-v31/colors.xml
@@ -19,6 +19,6 @@
@*android:color/system_neutral1_800
</color> <!-- neutral 800 -->
<color name="work_profile_button_stroke_color">
- @*android:color/system_neutral1_400
- </color> <!-- neutral 400 -->
+ @*android:color/system_accent1_200
+ </color> <!-- accent 200 -->
</resources>
diff --git a/res/values-night-v31/styles.xml b/res/values-night-v31/styles.xml
index f58593c58..0cbb57b2a 100644
--- a/res/values-night-v31/styles.xml
+++ b/res/values-night-v31/styles.xml
@@ -27,4 +27,11 @@
<item name="fontFamily">@string/config_fontFamilyMedium</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
+
+ <style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
+ <item name="android:backgroundTint">@android:color/transparent</item>
+ <item name="android:textColor">@*android:color/system_neutral1_100</item>
+ <item name="android:textAllCaps">false</item>
+ <item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
+ </style>
</resources>
diff --git a/res/values-v31/colors.xml b/res/values-v31/colors.xml
index 40296850b..1598acede 100644
--- a/res/values-v31/colors.xml
+++ b/res/values-v31/colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -15,6 +14,8 @@
-->
<resources>
- <color name="tab_selected_text_color">@android:color/white</color>
- <color name="work_profile_button_stroke_color">#747775</color> <!-- neutral 500 -->
+ <color name="tab_selected_text_color">@android:color/white</color>
+ <color name="work_profile_button_stroke_color">
+ @*android:color/system_accent1_600
+ </color> <!-- primary 600 -->
</resources>
diff --git a/res/values-v31/dimens.xml b/res/values-v31/dimens.xml
index 517a12d2f..87b5f1a6e 100644
--- a/res/values-v31/dimens.xml
+++ b/res/values-v31/dimens.xml
@@ -21,4 +21,5 @@
<dimen name="profile_tab_padding">20dp</dimen>
<dimen name="cross_profile_button_corner_radius">30dp</dimen>
<dimen name="cross_profile_button_stroke_width">1dp</dimen>
+ <dimen name="cross_profile_button_message_margin_top">16dp</dimen>
</resources>
diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index 83bd86f5e..eaaa2b998 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -41,7 +41,7 @@
<style name="EmptyStateButton" parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:backgroundTint">@android:color/transparent</item>
- <item name="android:textColor">?android:attr/colorAccent</item>
+ <item name="android:textColor">@*android:color/system_neutral1_900</item>
<item name="android:textAllCaps">false</item>
<item name="android:textAppearance">@style/EmptyStateButtonTextAppearance</item>
</style>
diff --git a/res/values-v31/styles_text.xml b/res/values-v31/styles_text.xml
index 4307c51a3..527e2de7b 100644
--- a/res/values-v31/styles_text.xml
+++ b/res/values-v31/styles_text.xml
@@ -17,6 +17,12 @@
<style name="EmptyStateTitleText">
<item name="android:textColor">@color/empty_state_text</item>
<item name="android:textSize">18sp</item>
- <item name="fontFamily">@string/config_fontFamilyMedium</item>
+ <item name="fontFamily">@string/config_headerFontFamily</item>
+ </style>
+
+ <style name="EmptyStateMessageText">
+ <item name="android:textColor">?android:textColorSecondary</item>
+ <item name="android:textSize">14sp</item>
+ <item name="fontFamily">@string/config_fontFamily</item>
</style>
</resources> \ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 4019304aa..037375385 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -131,4 +131,5 @@
<dimen name="item_doc_inflated_message_padding_top">0dp</dimen>
<dimen name="cross_profile_button_corner_radius">0dp</dimen>
<dimen name="cross_profile_button_stroke_width">0dp</dimen>
+ <dimen name="cross_profile_button_message_margin_top">4dp</dimen>
</resources>