summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorSetup Wizard Team <android-setup-team-eng@google.com>2019-05-09 12:24:33 +0800
committerNicole Huang <nicolehuang@google.com>2019-05-09 11:25:45 +0000
commitd77ef759a65b6621e527ab528a34681df8c7e736 (patch)
treeab36bd589a071e8cf0950b0c609b6387b5a2e290 /main
parent800095948e28b673898cd7d96e5a945c0935a1d4 (diff)
downloadsetupdesign-d77ef759a65b6621e527ab528a34681df8c7e736.tar.gz
Import updated Android Setupdesign Library 247352933
Copied from google3/third_party/java_src/android_libs/setupdesign Bug: 131432480 Test: mm Included changes: - 247352933 Check SDK version before access attr to set system bars p... - 245773665 Create SudContent.Glif PiperOrigin-RevId: 247352933 Change-Id: Ie7dfa5e2b0593803b060ba9ec44be077dc836722
Diffstat (limited to 'main')
-rw-r--r--main/res/drawable-v21/sud_fourcolor_progress_bar.xml2
-rw-r--r--main/res/values-v21/styles.xml8
-rw-r--r--main/res/values/dimens.xml2
-rw-r--r--main/res/values/styles.xml17
4 files changed, 24 insertions, 5 deletions
diff --git a/main/res/drawable-v21/sud_fourcolor_progress_bar.xml b/main/res/drawable-v21/sud_fourcolor_progress_bar.xml
index 2ac35ee..19e582a 100644
--- a/main/res/drawable-v21/sud_fourcolor_progress_bar.xml
+++ b/main/res/drawable-v21/sud_fourcolor_progress_bar.xml
@@ -22,7 +22,7 @@
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingPrefix">
<!-- Ignore MissingPrefix: aapt:attr tags take the name attribute without "android:" prefix -->
- <!-- TODO(yukl): Update to a newer version of lint which properly handles this case -->
+ <!-- TODO: Update to a newer version of lint which properly handles this case -->
<aapt:attr name="android:drawable">
<vector android:width="823dp" android:height="823dp" android:viewportHeight="823"
android:viewportWidth="823">
diff --git a/main/res/values-v21/styles.xml b/main/res/values-v21/styles.xml
index 79b006a..6a4df1b 100644
--- a/main/res/values-v21/styles.xml
+++ b/main/res/values-v21/styles.xml
@@ -97,4 +97,12 @@
<item name="android:paddingLeft">@dimen/sud_edit_text_padding_horizontal</item>
<item name="android:paddingRight">@dimen/sud_edit_text_padding_horizontal</item>
</style>
+
+ <style name="SudThemeGlif" parent="SudBaseThemeGlif">
+ <item name="sucSystemNavBarBackgroundColor" tools:targetApi="lollipop">?android:attr/navigationBarColor</item>
+ </style>
+
+ <style name="SudThemeGlif.Light" parent="SudBaseThemeGlif.Light">
+ <item name="sucSystemNavBarBackgroundColor" tools:targetApi="lollipop">?android:attr/navigationBarColor</item>
+ </style>
</resources>
diff --git a/main/res/values/dimens.xml b/main/res/values/dimens.xml
index 404d906..2adc3c7 100644
--- a/main/res/values/dimens.xml
+++ b/main/res/values/dimens.xml
@@ -55,6 +55,8 @@
<dimen name="sud_description_glif_margin_top">3dp</dimen>
<dimen name="sud_description_glif_margin_bottom_lists">24dp</dimen>
+ <dimen name="sud_content_glif_margin_top">32dp</dimen>
+
<dimen name="sud_content_illustration_max_height">312dp</dimen>
<dimen name="sud_content_illustration_max_width">312dp</dimen>
<dimen name="sud_content_illustration_min_height">172dp</dimen>
diff --git a/main/res/values/styles.xml b/main/res/values/styles.xml
index 81d769c..9f64b2c 100644
--- a/main/res/values/styles.xml
+++ b/main/res/values/styles.xml
@@ -89,7 +89,7 @@
<item name="textAppearanceListItemSmall">@style/TextAppearance.SudItemSummary</item>
</style>
- <style name="SudThemeGlif" parent="Theme.AppCompat.NoActionBar">
+ <style name="SudBaseThemeGlif" parent="Theme.AppCompat.NoActionBar">
<item name="android:colorBackground">@color/sud_glif_background_color_dark</item>
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
@@ -133,11 +133,12 @@
<item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item>
<item name="sucFooterBarButtonHighlightAlpha">?attr/sudButtonHighlightAlpha</item>
<item name="sucStatusBarBackground">?android:attr/colorBackground</item>
- <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item>
+ <item name="sucSystemNavBarBackgroundColor">@android:color/black</item>
<item name="sucFooterBarPaddingVertical">@dimen/sud_glif_footer_padding_vertical</item>
</style>
+ <style name="SudThemeGlif" parent="SudBaseThemeGlif"/>
- <style name="SudThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar">
+ <style name="SudBaseThemeGlif.Light" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:colorBackground">@color/sud_glif_background_color_light</item>
<item name="android:indeterminateTint" tools:ignore="NewApi">?attr/colorControlActivated</item>
<!-- Specify the indeterminateTintMode to work around a bug in Lollipop -->
@@ -181,9 +182,10 @@
<item name="sucFooterBarButtonColorControlHighlightRipple">?attr/colorAccent</item>
<item name="sucFooterBarButtonHighlightAlpha">?attr/sudButtonHighlightAlpha</item>
<item name="sucStatusBarBackground">?android:attr/colorBackground</item>
- <item name="sucSystemNavBarBackgroundColor">?android:attr/navigationBarColor</item>
+ <item name="sucSystemNavBarBackgroundColor">@android:color/black</item>
<item name="sucFooterBarPaddingVertical">@dimen/sud_glif_footer_padding_vertical</item>
</style>
+ <style name="SudThemeGlif.Light" parent="SudBaseThemeGlif.Light"/>
<style name="SudThemeGlifV2" parent="SudThemeGlif">
<item name="android:colorBackground">@color/sud_glif_background_color_dark</item>
@@ -275,6 +277,13 @@
<item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
</style>
+ <!-- Ignore UnusedResources: Used by clients -->
+ <style name="SudContent.Glif" parent="SudDescription" tools:ignore="UnusedResources">
+ <item name="android:layout_marginTop">@dimen/sud_content_glif_margin_top</item>
+ <item name="android:gravity">?attr/sudGlifHeaderGravity</item>
+ <item name="android:textAlignment" tools:targetApi="jelly_bean_mr1">gravity</item>
+ </style>
+
<style name="TextAppearance.SudDescription" parent="TextAppearance.AppCompat.Medium">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/sud_description_text_size</item>