2fba1943fa
This bug only exist by launching WifiSettings from quick settings. Quick settings launch this page by intent, where we use Theme.Settings. However we only have frictionIconColor in Theme.SubSettings, not Theme.Settings. This CL move related attr to correct theme, so we won't show invisible icon anymore. Bug: 120710149 Test: Manual Change-Id: Iae07f6ca19eda0bfbc352f03787b5a583c4066f2
216 lines
11 KiB
XML
216 lines
11 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2010 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.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<resources>
|
|
|
|
<style name="Transparent">
|
|
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
</style>
|
|
|
|
<style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />
|
|
|
|
<style name="Theme.Settings" parent="Theme.SettingsBase">
|
|
<item name="preferenceTheme">@style/PreferenceTheme</item>
|
|
<item name="android:listPreferredItemHeight">72dip</item>
|
|
|
|
<item name="fingerprint_layout_theme">@style/FingerprintLayoutTheme</item>
|
|
<item name="face_layout_theme">@style/FaceLayoutTheme</item>
|
|
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
|
|
|
|
<!-- For wifi icon -->
|
|
<item name="wifi_signal">@drawable/wifi_signal</item>
|
|
<item name="wifi_signal_color">?android:attr/colorAccent</item>
|
|
<item name="wifi_friction">@drawable/wifi_friction</item>
|
|
<item name="frictionIconColor">?android:colorControlNormal</item>
|
|
|
|
<item name="side_margin">@dimen/settings_side_margin</item>
|
|
<item name="suwListItemIconColor">?android:attr/colorAccent</item>
|
|
|
|
<!-- Redefine the ActionBar style for contentInsetStart -->
|
|
<item name="android:actionBarStyle">@style/Widget.ActionBar</item>
|
|
|
|
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
|
|
|
|
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
|
|
|
|
<!-- For AndroidX AlertDialog -->
|
|
<item name="alertDialogTheme">@style/Theme.AlertDialog</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Setup</item>
|
|
|
|
<!-- For battery status icons in -->
|
|
<item name="batteryGoodColor">@color/battery_good_color_light</item>
|
|
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
|
|
<item name="batteryBadColor">@color/battery_bad_color_light</item>
|
|
|
|
<!-- TODO(118444000): Remove colorPrimary and colorPrimaryVariant -->
|
|
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
|
|
<item name="colorPrimaryVariant">@android:color/white</item>
|
|
</style>
|
|
|
|
<!-- Variant of the settings theme with no action bar. -->
|
|
<style name="Theme.Settings.NoActionBar">
|
|
<item name="android:windowActionBar">false</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
</style>
|
|
|
|
<style name="Theme.SubSettings.Base" parent="Theme.Settings">
|
|
<!-- Redefine the ActionBar style for contentInsetStart -->
|
|
<item name="android:actionBarStyle">@style/Widget.ActionBar.SubSettings</item>
|
|
|
|
<item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
|
|
</style>
|
|
|
|
<style name="Theme.SubSettings" parent="Theme.SubSettings.Base"/>
|
|
|
|
<style name="Theme.ProvisioningActivity" parent="@android:style/Theme.Translucent.NoTitleBar">
|
|
<item name="android:windowAnimationStyle">@null</item>
|
|
<item name="android:windowIsTranslucent">true</item>
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:windowContentOverlay">@null</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowIsFloating">true</item>
|
|
<item name="android:backgroundDimEnabled">false</item>
|
|
</style>
|
|
|
|
<style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
|
|
<item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
|
|
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
|
|
<item name="switchBarBackgroundColor">@color/switch_bar_background</item>
|
|
<item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
|
|
<item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
|
|
</style>
|
|
|
|
<style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
|
|
<item name="android:trackTint">@color/switchbar_switch_track_tint</item>
|
|
<item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item>
|
|
<item name="android:minHeight">@dimen/min_tap_target_size</item>
|
|
</style>
|
|
|
|
<style name="Theme.CryptKeeper" parent="@android:style/Theme.Material.NoActionBar">
|
|
<item name="android:windowTranslucentStatus">false</item>
|
|
<item name="android:windowTranslucentNavigation">false</item>
|
|
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
|
|
<item name="android:background">@android:color/black</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Unlock</item>
|
|
</style>
|
|
|
|
<style name="ThemeOverlay.AlertDialog" parent="@android:style/ThemeOverlay.Material.Dialog.Alert">
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
</style>
|
|
|
|
<style name="Theme.AlertDialog.Base" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
|
|
<item name="colorAccent">@*android:color/accent_device_default_light</item>
|
|
</style>
|
|
|
|
<style name="Theme.AlertDialog" parent="Theme.AlertDialog.Base">
|
|
<item name="android:windowSoftInputMode">adjustResize</item>
|
|
|
|
<!-- Redefine the ActionBar style for contentInsetStart -->
|
|
<item name="android:actionBarStyle">@style/Widget.ActionBar</item>
|
|
|
|
<!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
|
|
<item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
|
|
</style>
|
|
|
|
<style name="Theme.ConfirmDeviceCredentials" parent="Theme.SubSettings">
|
|
<item name="confirmDeviceCredentialsSideMargin">@dimen/confirm_credentials_side_margin</item>
|
|
<item name="confirmDeviceCredentialsTopMargin">@dimen/confirm_credentials_top_margin</item>
|
|
</style>
|
|
|
|
<style name="Theme.ConfirmDeviceCredentialsDark" parent="@android:style/Theme.DeviceDefault">
|
|
<item name="android:windowActionBar">false</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowBackground">?android:attr/colorPrimary</item>
|
|
|
|
<item name="confirmDeviceCredentialsSideMargin">32dp</item>
|
|
<item name="confirmDeviceCredentialsTopMargin">32dp</item>
|
|
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark</item>
|
|
|
|
<item name="android:windowAnimationStyle">@style/ConfirmDeviceCredentialsAnimationStyle</item>
|
|
</style>
|
|
|
|
<style name="Theme.ConfirmDeviceCredentialsWork" parent="Theme.ConfirmDeviceCredentialsDark">
|
|
<item name="*android:lockPatternStyle">@style/LockPatternStyle.Dark.Work</item>
|
|
<item name="android:colorAccent">@*android:color/white</item>
|
|
</style>
|
|
|
|
<style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar">
|
|
<item name="android:windowBackground">@android:color/transparent</item>
|
|
<item name="android:colorBackgroundCacheHint">@null</item>
|
|
<item name="android:windowShowWallpaper">true</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowTranslucentStatus">false</item>
|
|
<item name="android:windowTranslucentNavigation">false</item>
|
|
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
|
<item name="android:statusBarColor">#00000000</item>
|
|
<item name="android:navigationBarColor">#00000000</item>
|
|
</style>
|
|
|
|
<style name="FallbackHome.SetupWizard" parent="@android:style/Theme.Material.NoActionBar.Fullscreen">
|
|
<item name="android:windowBackground">@drawable/fallback_home_unprovisioned_background</item>
|
|
<item name="android:colorBackgroundCacheHint">@null</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
|
<item name="android:statusBarColor">#00000000</item>
|
|
<item name="android:navigationBarColor">#00000000</item>
|
|
</style>
|
|
|
|
<style name="Theme.BluetoothPermission" parent="@style/Theme.AlertDialog">
|
|
<item name="android:windowNoTitle">true</item>
|
|
</style>
|
|
|
|
<style name="Theme.Settings.HomeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
|
|
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
|
|
<item name="colorAccent">@*android:color/accent_device_default_light</item>
|
|
<item name="preferenceTheme">@style/PreferenceTheme</item>
|
|
|
|
<!-- action bar, needed for search bar icon tinting -->
|
|
<item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
|
|
|
|
<!-- For battery status icons in -->
|
|
<item name="batteryGoodColor">@color/battery_good_color_light</item>
|
|
<item name="batteryMaybeColor">@color/battery_maybe_color_light</item>
|
|
<item name="batteryBadColor">@color/battery_bad_color_light</item>
|
|
<!-- Define this color for material design -->
|
|
<item name="colorPrimaryVariant">@android:color/white</item>
|
|
</style>
|
|
|
|
<style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
|
|
<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
|
|
<item name="android:windowLightStatusBar">true</item>
|
|
<item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
|
|
<item name="android:navigationBarColor">@android:color/white</item>
|
|
<item name="android:windowBackground">@android:color/white</item>
|
|
<item name="android:windowLightNavigationBar">true</item>
|
|
</style>
|
|
|
|
<!-- Note that Dialog themes do not set list dividers -->
|
|
<style name="Theme.BottomDialog" parent="@*android:style/Theme.DeviceDefault.Settings.Dialog">
|
|
<item name="android:windowBackground">@drawable/settings_panel_background</item>
|
|
<item name="android:dividerHorizontal">@*android:drawable/list_divider_material</item>
|
|
<item name="android:windowNoTitle">true</item>
|
|
<item name="android:listDivider">@*android:drawable/list_divider_material</item>
|
|
<item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
|
|
</style>
|
|
|
|
</resources>
|