Merge "Device Default theming updates for Wear" into oc-mr1-dev
This commit is contained in:
@@ -17,8 +17,87 @@
|
||||
<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
|
||||
overlaying new theme colors. -->
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
primary_device_default_dark
|
||||
> from values/colors_material/primary_material_dark
|
||||
> from values/colors_material/material_grey_900
|
||||
= #ff212121
|
||||
! replaced with custom color #33ffffff
|
||||
-->
|
||||
<color name="primary_device_default_dark">#33ffffff</color>
|
||||
<!--
|
||||
primary_dark_device_default_dark
|
||||
> from values/colors_material/primary_dark_material_dark
|
||||
= @color/black
|
||||
-->
|
||||
<color name="primary_dark_device_default_dark">@color/black</color>
|
||||
<!--
|
||||
accent_device_default_dark
|
||||
> from values/colors_material/accent_material_dark
|
||||
> from values/colors_material/material_deep_teal_200
|
||||
= #ff80cbc4
|
||||
! replaced with custom color #5E97F6
|
||||
-->
|
||||
<color name="accent_device_default_dark">#5E97F6</color>
|
||||
<!--
|
||||
background_device_default_dark
|
||||
> from values/colors_material/background_material_dark
|
||||
> from values/colors_material/material_grey_850
|
||||
= #ff303030
|
||||
! replaced with custom color #232E33
|
||||
-->
|
||||
<color name="background_device_default_dark">#232E33</color>
|
||||
<!--
|
||||
background_floating_device_default_dark
|
||||
> from values/colors_material/background_floating_material_dark
|
||||
> from values/colors_material/material_grey_800
|
||||
= #ff424242
|
||||
! replaced with custom color #3E5059
|
||||
-->
|
||||
<color name="background_floating_device_default_dark">#3E5059</color>
|
||||
|
||||
<!--
|
||||
background_cache_hint_selector_device_default
|
||||
- note that this is based off of colors/background_cache_hint_selector_device_default
|
||||
xml drawable
|
||||
- uses ?attr/colorBackground and transparency to draw
|
||||
- no color customization required here
|
||||
-->
|
||||
|
||||
<!--
|
||||
button_normal_device_default_dark
|
||||
- uses ?attr/disabledAlpha and button_material_dark to draw
|
||||
- cloned to watch_btn_default.xml drawable
|
||||
(btn_default_material_dark & button_material_dark - see
|
||||
values-watch/colors_material.xml)
|
||||
-->
|
||||
<color name="button_normal_device_default_dark">@color/btn_default_material_dark</color>
|
||||
|
||||
<!-- Use the same value as for accent_device_default_dark but start with #99,
|
||||
i.e. 60% opacity -->
|
||||
<color name="accent_device_default_dark_60_percent_opacity">#995E97f6</color>
|
||||
|
||||
<!--
|
||||
foreground_device_default_dark
|
||||
- introduced to avoid coupling to foreground_material_dark
|
||||
- colorForeground typically falls through Theme.DeviceDefault to Theme.Material
|
||||
-->
|
||||
<color name="foreground_device_default_dark">@color/white</color>
|
||||
|
||||
<!--
|
||||
error_color_device_default_dark
|
||||
- introduced to avoid coupling to error_color_material (also #F4511E)
|
||||
- colorError typically falls through Theme.DeviceDefault to Theme.Material
|
||||
-->
|
||||
<color name="error_color_device_default_dark">#F4511E</color>
|
||||
|
||||
<!-- deprecated for Wear
|
||||
these overrides exist only for compatibility with existing
|
||||
WTS theme test heuristics, based on the previous modifications
|
||||
to the material theme, they should not be used for customization
|
||||
as they are not exposed via publicly accessible attributes -->
|
||||
<color name="accent_device_default_700">#5385DB</color>
|
||||
<color name="accent_device_default_light">#75A4F5</color>
|
||||
<color name="accent_device_default_50">#93B7F5</color>
|
||||
</resources>
|
||||
|
||||
@@ -14,15 +14,8 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
<resources>
|
||||
<color name="background_material_dark">#232E33</color>
|
||||
<color name="background_floating_material_dark">#3E5059</color>
|
||||
|
||||
<color name="accent_material_700">#5385DB</color>
|
||||
<color name="accent_material_light">#75A4F5</color>
|
||||
<color name="accent_material_dark">#5E97F6</color>
|
||||
<color name="accent_material_50">#93B7F5</color>
|
||||
<!-- referenced in colors/watch_btn_default.xml selector -->
|
||||
<color name="button_material_dark">#ff919699</color>
|
||||
|
||||
<color name="primary_material_dark">#33ffffff</color>
|
||||
|
||||
<color name="button_material_dark">#ff919699</color>
|
||||
</resources>
|
||||
|
||||
24
core/res/res/values-watch/dimens_device_defaults.xml
Normal file
24
core/res/res/values-watch/dimens_device_defaults.xml
Normal file
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2016 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>
|
||||
<!-- Alpha transparency for wigets that set enablement/disablement programmatically
|
||||
transparency is applied in the disabled state -->
|
||||
<dimen name="disabled_alpha_device_default">0.5</dimen>
|
||||
<!-- Alpha transparency applied to elements which are considered primary (e.g. primary text) -->
|
||||
<dimen name="primary_content_alpha_device_default">1.0</dimen>
|
||||
<!-- Alpha transparency applied to elements which are considered secondary (e.g. secondary text) -->
|
||||
<dimen name="secondary_content_alpha_device_default">0.8</dimen>
|
||||
</resources>
|
||||
@@ -37,11 +37,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar -->
|
||||
@@ -49,11 +54,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar. This theme
|
||||
@@ -62,11 +72,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar and
|
||||
@@ -77,11 +92,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} that has no title bar and translucent
|
||||
@@ -91,11 +111,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Theme used for the intent picker activity. -->
|
||||
@@ -134,11 +159,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a window that should look like the Settings app. -->
|
||||
@@ -156,11 +186,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Settings.CompactMenu" parent="Theme.Material.CompactMenu">
|
||||
@@ -168,11 +203,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a
|
||||
@@ -182,11 +222,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar -->
|
||||
@@ -195,11 +240,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog_NoActionBar} that has a nice minimum width
|
||||
@@ -209,11 +259,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a window that will be displayed either full-screen on smaller
|
||||
@@ -222,11 +277,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a window without an action bar that will be displayed either
|
||||
@@ -236,11 +296,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a presentation window on a secondary display. -->
|
||||
@@ -248,11 +313,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for panel windows. This removes all extraneous window
|
||||
@@ -262,11 +332,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear
|
||||
@@ -275,11 +350,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear
|
||||
@@ -288,11 +368,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault style for input methods, which is used by the
|
||||
@@ -301,11 +386,16 @@ a similar way.
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert">
|
||||
@@ -314,22 +404,32 @@ a similar way.
|
||||
<!-- Color palette Dialog -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.Material.SearchBar">
|
||||
<!-- Color palette Dark -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">@color/background_device_default_dark</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame">
|
||||
@@ -337,10 +437,15 @@ a similar way.
|
||||
<!-- Color palette Dialog -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorForeground">@color/foreground_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
<item name="colorBackground">?attr/colorBackgroundFloating</item>
|
||||
<item name="colorBackgroundFloating">@color/background_floating_device_default_dark</item>
|
||||
<item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_device_default</item>
|
||||
<item name="colorButtonNormal">@color/button_normal_device_default_dark</item>
|
||||
<item name="colorError">@color/error_color_device_default_dark</item>
|
||||
<item name="disabledAlpha">@dimen/disabled_alpha_device_default</item>
|
||||
<item name="primaryContentAlpha">@dimen/primary_content_alpha_device_default</item>
|
||||
<item name="secondaryContentAlpha">@dimen/secondary_content_alpha_device_default</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user