diff options
| author | 2020-06-04 17:47:29 +0000 | |
|---|---|---|
| committer | 2020-06-04 17:47:29 +0000 | |
| commit | 6a033d239e479a9af756c19f1178150eb9ab777e (patch) | |
| tree | 65054f0b07831e1e7d644ef2cf9225277ea367f6 | |
| parent | 084e7473fbaec4d3fe4d55c190c4f122a588f4d8 (diff) | |
| parent | 9b4b852e77d9d5846e99592b09d1e4127afeff23 (diff) | |
Merge "Change colors in QSSecurityFooter" into rvc-dev
| -rw-r--r-- | packages/SystemUI/res/layout/quick_settings_footer.xml | 6 | ||||
| -rw-r--r-- | packages/SystemUI/res/values-night/styles.xml | 5 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/styles.xml | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/packages/SystemUI/res/layout/quick_settings_footer.xml b/packages/SystemUI/res/layout/quick_settings_footer.xml index 846c5386dd06..15f398aa52e6 100644 --- a/packages/SystemUI/res/layout/quick_settings_footer.xml +++ b/packages/SystemUI/res/layout/quick_settings_footer.xml @@ -23,7 +23,7 @@ android:paddingStart="@dimen/qs_footer_padding_start" android:paddingEnd="@dimen/qs_footer_padding_end" android:gravity="center_vertical" - android:background="?android:attr/colorPrimary" > + android:background="@android:color/transparent"> <TextView android:id="@+id/footer_text" @@ -32,7 +32,7 @@ android:gravity="start" android:layout_weight="1" android:textAppearance="@style/TextAppearance.QS.TileLabel" - android:textColor="?android:attr/textColorSecondary"/> + style="@style/qs_security_footer"/> <ImageView android:id="@+id/footer_icon" @@ -40,6 +40,6 @@ android:layout_height="@dimen/qs_footer_icon_size" android:contentDescription="@null" android:src="@drawable/ic_info_outline" - android:tint="?android:attr/textColorSecondary"/> + style="@style/qs_security_footer"/> </LinearLayout> diff --git a/packages/SystemUI/res/values-night/styles.xml b/packages/SystemUI/res/values-night/styles.xml index 4fdeb6fa4a92..50261e1b2139 100644 --- a/packages/SystemUI/res/values-night/styles.xml +++ b/packages/SystemUI/res/values-night/styles.xml @@ -29,4 +29,9 @@ <item name="android:textColor">?android:attr/textColorPrimary</item> </style> + <style name="qs_security_footer" parent="@style/qs_theme"> + <item name="android:textColor">#B3FFFFFF</item> <!-- 70% white --> + <item name="android:tint">#FFFFFFFF</item> + </style> + </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index ed36bdbe1e7e..39f78bf46028 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -387,6 +387,11 @@ <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item> </style> + <style name="qs_security_footer" parent="@style/qs_theme"> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:tint">?android:attr/textColorSecondary</item> + </style> + <style name="systemui_theme_remote_input" parent="@android:style/Theme.DeviceDefault.Light"> <item name="android:colorAccent">@color/remote_input_accent</item> </style> |