Merge "Refactor DeviceDefault themes." into nyc-mr1-dev
This commit is contained in:
Andrew Sapperstein
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
2f75cf4bb5
31
core/res/res/values/colors_device_defaults.xml
Normal file
31
core/res/res/values/colors_device_defaults.xml
Normal file
@@ -0,0 +1,31 @@
|
||||
<?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.
|
||||
-->
|
||||
|
||||
<!-- Colors specific to DeviceDefault themes. These are mostly pass-throughs to enable
|
||||
overlaying new theme colors. -->
|
||||
<resources>
|
||||
<color name="primary_device_default_dark">@color/primary_material_dark</color>
|
||||
<color name="primary_device_default_light">@color/primary_material_light</color>
|
||||
<color name="primary_device_default_settings">@color/primary_material_settings</color>
|
||||
<color name="primary_dark_device_default_dark">@color/primary_dark_material_dark</color>
|
||||
<color name="primary_dark_device_default_light">@color/primary_dark_material_light</color>
|
||||
<color name="primary_dark_device_default_settings">@color/primary_dark_material_settings</color>
|
||||
|
||||
<color name="secondary_device_default_settings">@color/secondary_material_settings</color>
|
||||
|
||||
<color name="accent_device_default_light">@color/accent_material_light</color>
|
||||
<color name="accent_device_default_dark">@color/accent_material_dark</color>
|
||||
</resources>
|
||||
@@ -26,9 +26,13 @@
|
||||
|
||||
<color name="primary_material_dark">@color/material_grey_900</color>
|
||||
<color name="primary_material_light">@color/material_grey_100</color>
|
||||
<color name="primary_material_settings">@color/material_blue_grey_900</color>
|
||||
<color name="primary_dark_material_dark">@color/black</color>
|
||||
<color name="primary_dark_material_light">@color/material_grey_600</color>
|
||||
<color name="primary_dark_material_light_light_status_bar">@color/material_grey_300</color>
|
||||
<color name="primary_dark_material_settings">@color/material_blue_grey_950</color>
|
||||
|
||||
<color name="secondary_material_settings">@color/material_blue_grey_800</color>
|
||||
|
||||
<color name="accent_material_light">@color/material_deep_teal_500</color>
|
||||
<color name="accent_material_dark">@color/material_deep_teal_200</color>
|
||||
|
||||
@@ -199,25 +199,50 @@ easier.
|
||||
|
||||
<item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.MediaRouteButton</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar -->
|
||||
<style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Material.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Material.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar. This theme
|
||||
sets {@link android.R.attr#windowFullscreen} to true. -->
|
||||
<style name="Theme.DeviceDefault.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen" />
|
||||
<style name="Theme.DeviceDefault.NoActionBar.Fullscreen" parent="Theme.Material.NoActionBar.Fullscreen">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with no action bar and no status bar and
|
||||
extending in to overscan region. This theme
|
||||
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
|
||||
to true. -->
|
||||
<style name="Theme.DeviceDefault.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan" />
|
||||
<style name="Theme.DeviceDefault.NoActionBar.Overscan" parent="Theme.Material.NoActionBar.Overscan">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} that has no title bar and translucent
|
||||
system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and
|
||||
{@link android.R.attr#windowTranslucentNavigation} to true. -->
|
||||
<style name="Theme.DeviceDefault.NoActionBar.TranslucentDecor" parent="Theme.Material.NoActionBar.TranslucentDecor" />
|
||||
<style name="Theme.DeviceDefault.NoActionBar.TranslucentDecor" parent="Theme.Material.NoActionBar.TranslucentDecor">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for dialog windows and activities. This changes the window to be
|
||||
floating (not fill the entire screen), and puts a frame around its contents. You can set this
|
||||
@@ -231,18 +256,38 @@ easier.
|
||||
|
||||
<item name="textAppearance">@style/TextAppearance.DeviceDefault</item>
|
||||
<item name="textAppearanceInverse">@style/TextAppearance.DeviceDefault.Inverse</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog} that has a nice minimum width for a
|
||||
regular dialog. -->
|
||||
<style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth" />
|
||||
<style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Material.Dialog.MinWidth">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar -->
|
||||
<style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Material.Dialog.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Dialog_NoActionBar} that has a nice minimum width
|
||||
for a regular dialog. -->
|
||||
<style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth" />
|
||||
<style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Dialog.NoActionBar.MinWidth">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
|
||||
<style name="Theme.DeviceDefault.Dialog.FixedSize">
|
||||
@@ -262,44 +307,99 @@ easier.
|
||||
|
||||
<!-- DeviceDefault theme for a window that will be displayed either full-screen on smaller
|
||||
screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
|
||||
<style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge" />
|
||||
<style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Material.DialogWhenLarge">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a window without an action bar that will be displayed either
|
||||
full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
|
||||
xlarge). -->
|
||||
<style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="Theme.Material.DialogWhenLarge.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for a presentation window on a secondary display. -->
|
||||
<style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation" />
|
||||
<style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Material.Dialog.Presentation">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for panel windows. This removes all extraneous window
|
||||
decorations, so you basically have an empty rectangle in which to place your content. It makes
|
||||
the window floating, with a transparent background, and turns off dimming behind the window. -->
|
||||
<style name="Theme.DeviceDefault.Panel" parent="Theme.Material.Panel" />
|
||||
<style name="Theme.DeviceDefault.Panel" parent="Theme.Material.Panel">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear
|
||||
behind them. -->
|
||||
<style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Material.Wallpaper" />
|
||||
<style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Material.Wallpaper">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear
|
||||
behind them and without an action bar. -->
|
||||
<style name="Theme.DeviceDefault.Wallpaper.NoTitleBar" parent="Theme.Material.Wallpaper.NoTitleBar" />
|
||||
<style name="Theme.DeviceDefault.Wallpaper.NoTitleBar" parent="Theme.Material.Wallpaper.NoTitleBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault style for input methods, which is used by the
|
||||
{@link android.inputmethodservice.InputMethodService} class.-->
|
||||
<style name="Theme.DeviceDefault.InputMethod" parent="Theme.Material.InputMethod" />
|
||||
<style name="Theme.DeviceDefault.InputMethod" parent="Theme.Material.InputMethod">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault style for input methods, which is used by the
|
||||
{@link android.service.voice.VoiceInteractionSession} class.-->
|
||||
<style name="Theme.DeviceDefault.VoiceInteractionSession" parent="Theme.Material.VoiceInteractionSession" >
|
||||
|
||||
<style name="Theme.DeviceDefault.VoiceInteractionSession" parent="Theme.Material.VoiceInteractionSession">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Material.Dialog.Alert">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.Material.SearchBar" />
|
||||
<style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame" />
|
||||
<style name="Theme.DeviceDefault.SearchBar" parent="Theme.Material.SearchBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Material.Dialog.NoFrame">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_dark</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault} with a light-colored style -->
|
||||
<style name="Theme.DeviceDefault.Light" parent="Theme.Material.Light" >
|
||||
@@ -447,34 +547,63 @@ easier.
|
||||
|
||||
<item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.Light.MediaRouteButton</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of the DeviceDefault (light) theme that has a solid (opaque) action bar with an
|
||||
inverse color profile. -->
|
||||
<style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Material.Light.DarkActionBar" />
|
||||
<style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Material.Light.DarkActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_dark</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_dark</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Material.Light.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Material.Light.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar.
|
||||
This theme sets {@link android.R.attr#windowFullscreen} to true. -->
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="Theme.Material.Light.NoActionBar.Fullscreen" />
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="Theme.Material.Light.NoActionBar.Fullscreen">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar and no status bar
|
||||
and extending in to overscan region. This theme
|
||||
sets {@link android.R.attr#windowFullscreen} and {@link android.R.attr#windowOverscan}
|
||||
to true. -->
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="Theme.Material.Light.NoActionBar.Overscan" />
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="Theme.Material.Light.NoActionBar.Overscan">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light} that has no title bar and translucent
|
||||
system decor. This theme sets {@link android.R.attr#windowTranslucentStatus} and
|
||||
{@link android.R.attr#windowTranslucentNavigation} to true. -->
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="Theme.Material.Light.NoActionBar.TranslucentDecor" />
|
||||
<style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="Theme.Material.Light.NoActionBar.TranslucentDecor">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault light theme for dialog windows and activities. This changes the window to be
|
||||
floating (not fill the entire screen), and puts a frame around its contents. You can set this
|
||||
theme on an activity if you would like to make an activity that looks like a Dialog.-->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Material.Light.Dialog" >
|
||||
<style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Material.Light.Dialog">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault.Light</item>
|
||||
<item name="windowAnimationStyle">@style/Animation.DeviceDefault.Dialog</item>
|
||||
|
||||
@@ -483,18 +612,38 @@ easier.
|
||||
|
||||
<item name="textAppearance">@style/TextAppearance.DeviceDefault</item>
|
||||
<item name="textAppearanceInverse">@style/TextAppearance.DeviceDefault.Inverse</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
|
||||
regular dialog. -->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="Theme.Material.Light.Dialog.MinWidth" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="Theme.Material.Light.Dialog.MinWidth">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="Theme.Material.Light.Dialog.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="Theme.Material.Light.Dialog.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog_NoActionBar} that has a nice minimum
|
||||
width for a regular dialog. -->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Light.Dialog.NoActionBar.MinWidth" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="Theme.Material.Light.Dialog.NoActionBar.MinWidth">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of Theme.DeviceDefault.Dialog that has a fixed size. -->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.FixedSize">
|
||||
@@ -502,6 +651,11 @@ easier.
|
||||
<item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item>
|
||||
<item name="windowFixedHeightMajor">@dimen/dialog_fixed_height_major</item>
|
||||
<item name="windowFixedHeightMinor">@dimen/dialog_fixed_height_minor</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Variant of Theme.DeviceDefault.Dialog.NoActionBar that has a fixed size. -->
|
||||
@@ -510,33 +664,74 @@ easier.
|
||||
<item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item>
|
||||
<item name="windowFixedHeightMajor">@dimen/dialog_fixed_height_major</item>
|
||||
<item name="windowFixedHeightMinor">@dimen/dialog_fixed_height_minor</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault light theme for a window that will be displayed either full-screen on smaller
|
||||
screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
|
||||
<style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge" />
|
||||
<style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault light theme for a window without an action bar that will be displayed either
|
||||
full-screen on smaller screens (small, normal) or as a dialog on larger screens (large,
|
||||
xlarge). -->
|
||||
<style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar" />
|
||||
<style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault light theme for a presentation window on a secondary display. -->
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation" />
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault light theme for panel windows. This removes all extraneous window
|
||||
decorations, so you basically have an empty rectangle in which to place your content. It makes
|
||||
the window floating, with a transparent background, and turns off dimming behind the window. -->
|
||||
<style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Material.Light.Panel" />
|
||||
<style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Material.Light.Panel">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Material.Light.Dialog.Alert">
|
||||
<item name="windowTitleStyle">@style/DialogWindowTitle.DeviceDefault.Light</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Material.Light.SearchBar">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Material.Light.SearchBar" />
|
||||
|
||||
<!-- DeviceDefault theme for a window that should look like the Settings app. -->
|
||||
<style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings" />
|
||||
<style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings">
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_settings</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Theme used for the intent picker activity. -->
|
||||
<style name="Theme.DeviceDefault.Resolver" parent="Theme.Material.Light">
|
||||
@@ -549,8 +744,13 @@ easier.
|
||||
<item name="colorControlActivated">?attr/colorControlHighlight</item>
|
||||
<item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>
|
||||
<item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimary">@color/primary_device_default_light</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_device_default_light</item>
|
||||
<item name="colorAccent">@color/accent_device_default_light</item>
|
||||
</style>
|
||||
|
||||
<!-- DeviceDefault theme for the default system theme. -->
|
||||
<style name="Theme.DeviceDefault.System" parent="Theme.Material.Light.DarkActionBar" />
|
||||
<style name="Theme.DeviceDefault.System" parent="Theme.DeviceDefault.Light.DarkActionBar" />
|
||||
</resources>
|
||||
|
||||
@@ -1303,8 +1303,8 @@ please see themes_device_defaults.xml.
|
||||
|
||||
<!-- Default theme for Settings and activities launched from Settings. -->
|
||||
<style name="Theme.Material.Settings" parent="Theme.Material.Light.DarkActionBar">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
|
||||
<item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>
|
||||
<item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>
|
||||
@@ -1313,8 +1313,8 @@ please see themes_device_defaults.xml.
|
||||
|
||||
<!-- Default theme for Settings and activities launched from Settings. -->
|
||||
<style name="Theme.Material.Settings.NoActionBar" parent="Theme.Material.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
|
||||
<item name="presentationTheme">@style/Theme.Material.Settings.Dialog.Presentation</item>
|
||||
<item name="searchDialogTheme">@style/Theme.Material.Settings.SearchBar</item>
|
||||
@@ -1322,41 +1322,41 @@ please see themes_device_defaults.xml.
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.BaseDialog" parent="Theme.Material.Light.BaseDialog">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.Dialog" parent="Theme.Material.Settings.BaseDialog" />
|
||||
|
||||
<style name="Theme.Material.Settings.Dialog.BaseAlert" parent="Theme.Material.Light.Dialog.BaseAlert">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.Dialog.Alert" parent="Theme.Material.Settings.Dialog.BaseAlert" />
|
||||
|
||||
<style name="Theme.Material.Settings.DialogWhenLarge" parent="Theme.Material.Light.DialogWhenLarge.DarkActionBar">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.DialogWhenLarge.NoActionBar" parent="Theme.Material.Light.DialogWhenLarge.NoActionBar">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.Dialog.Presentation" parent="Theme.Material.Light.Dialog.Presentation">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.SearchBar" parent="Theme.Material.Light.SearchBar">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Material.Settings.CompactMenu" parent="Theme.Material.Light.CompactMenu">
|
||||
<item name="colorPrimary">@color/material_blue_grey_900</item>
|
||||
<item name="colorPrimaryDark">@color/material_blue_grey_950</item>
|
||||
<item name="colorPrimary">@color/primary_material_settings</item>
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_settings</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
||||
@@ -24,6 +24,7 @@ import android.content.Intent;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager.NameNotFoundException;
|
||||
import android.content.res.Resources.Theme;
|
||||
import android.content.res.TypedArray;
|
||||
import android.net.Uri;
|
||||
import android.text.TextUtils;
|
||||
import android.util.Log;
|
||||
@@ -162,10 +163,9 @@ public class HelpUtils {
|
||||
intent.putExtra(EXTRA_CONTEXT, backupContext);
|
||||
}
|
||||
intent.putExtra(EXTRA_THEME, 1 /* Light, dark action bar */);
|
||||
Theme theme = context.getTheme();
|
||||
TypedValue typedValue = new TypedValue();
|
||||
theme.resolveAttribute(android.R.attr.colorPrimary, typedValue, true);
|
||||
intent.putExtra(EXTRA_PRIMARY_COLOR, context.getColor(typedValue.resourceId));
|
||||
TypedArray array = context.obtainStyledAttributes(new int[]{android.R.attr.colorPrimary});
|
||||
intent.putExtra(EXTRA_PRIMARY_COLOR, array.getColor(0, 0));
|
||||
array.recycle();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user