Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b61d540 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Revert changes to default styles and themes"

parents 3d4c3aca 0269b70f

core/res/res/values/styles_device_defaults.xml

+707 −238

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/themes_device_defaults.xml

+41 −41
Original line number Diff line number Diff line
@@ -32,24 +32,24 @@ easier. 
 -->

<resources>



    <!-- The default theme for apps that target API level 20 and higher.

    <!-- The default theme for apps that target API level 14 and higher.

         <p>The DeviceDefault themes are aliases for a specific device’s native look and feel. The

         DeviceDefault theme family and widget style family offer ways for you to target your app

         to a device’s native theme with all device customizations intact.</p>

         <p>For example, when you set your app's {@code targetSdkVersion} to 20 or higher, this

         <p>For example, when you set your app's {@code targetSdkVersion} to 14 or higher, this

         theme is applied to your application by default. As such, your app might appear with the

         {@link #Theme_Quantum_Light Quantum.Light} styles on one device, but with a different set of styles on

         {@link #Theme_Holo Holo} styles on one device, but with a different set of styles on

         another device. This is great if you want your app to fit with the device's native look and

         feel. If, however, you prefer to keep your UI style the same across all devices, you should

         apply a specific theme such as {@link #Theme_Quantum_Light Quantum.Light} or one of your own design.

         For more information, read <a

         href="http://android-developers.blogspot.com/20XX/XX/quantum-everywhere.html">Quantum.Light

         apply a specific theme such as {@link #Theme_Holo Holo} or one of your own design. For more

         information, read <a

         href="http://android-developers.blogspot.com/2012/01/holo-everywhere.html">Holo

         Everywhere</a>.</p>

         <p>Styles used by the DeviceDefault theme are named using the convention

         Type.DeviceDefault.Etc (for example, {@code Widget.DeviceDefault.Button} and

         {@code TextAppearance.DeviceDefault.Widget.PopupMenu.Large}).</p>

          -->

    <style name="Theme.DeviceDefault" parent="Theme.Quantum" >

    <style name="Theme.DeviceDefault" parent="Theme.Holo" >

        <!-- Text styles -->

        <item name="textAppearance">@android:style/TextAppearance.DeviceDefault</item>

        <item name="textAppearanceInverse">@android:style/TextAppearance.DeviceDefault.Inverse</item>
@@ -210,29 +210,29 @@ easier. 
    </style>



    <!-- Variant of {@link #Theme_DeviceDefault} with no action bar -->

    <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Quantum.NoActionBar" >

    <style name="Theme.DeviceDefault.NoActionBar" parent="Theme.Holo.NoActionBar" >

    </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.Quantum.NoActionBar.Fullscreen" >

    <style name="Theme.DeviceDefault.NoActionBar.Fullscreen" parent="Theme.Holo.NoActionBar.Fullscreen" >

    </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.Quantum.NoActionBar.Overscan" >

    <style name="Theme.DeviceDefault.NoActionBar.Overscan" parent="Theme.Holo.NoActionBar.Overscan" >

    </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.Quantum.NoActionBar.TranslucentDecor" >

    <style name="Theme.DeviceDefault.NoActionBar.TranslucentDecor" parent="Theme.Holo.NoActionBar.TranslucentDecor" >

    </style>



    <!-- Variant of {@link #Theme_DeviceDefault} with a light-colored style -->

    <style name="Theme.DeviceDefault.Light" parent="Theme.Quantum.Light" >

    <style name="Theme.DeviceDefault.Light" parent="Theme.Holo.Light" >

        <!-- Text styles -->

        <item name="textAppearance">@android:style/TextAppearance.DeviceDefault.Light</item>

        <item name="textAppearanceInverse">@android:style/TextAppearance.DeviceDefault.Light.Inverse</item>
@@ -387,29 +387,29 @@ easier. 
        <item name="mediaRouteButtonStyle">@android:style/Widget.DeviceDefault.Light.MediaRouteButton</item>

    </style>

    <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->

    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Quantum.Light.NoActionBar" >

    <style name="Theme.DeviceDefault.Light.NoActionBar" parent="Theme.Holo.Light.NoActionBar" >

    </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.Quantum.Light.NoActionBar.Fullscreen" >

    <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="Theme.Holo.Light.NoActionBar.Fullscreen" >

    </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.Quantum.Light.NoActionBar.Overscan" >

           parent="Theme.Holo.Light.NoActionBar.Overscan" >

    </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.Quantum.Light.NoActionBar.TranslucentDecor" >

           parent="Theme.Holo.Light.NoActionBar.TranslucentDecor" >

    </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

    theme on an activity if you would like to make an activity that looks like a Dialog. -->

    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Quantum.Dialog" >

    <style name="Theme.DeviceDefault.Dialog" parent="Theme.Holo.Dialog" >

        <item name="android:windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.DeviceDefault.Dialog</item>
@@ -421,16 +421,16 @@ easier. 
    </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.Quantum.Dialog.MinWidth" >

    <style name="Theme.DeviceDefault.Dialog.MinWidth" parent="Theme.Holo.Dialog.MinWidth" >



    </style>

    <!-- Variant of {@link #Theme_DeviceDefault_Dialog} without an action bar -->

    <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Quantum.Dialog.NoActionBar" >

    <style name="Theme.DeviceDefault.Dialog.NoActionBar" parent="Theme.Holo.Dialog.NoActionBar" >



    </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.Quantum.Dialog.NoActionBar.MinWidth" >

    <style name="Theme.DeviceDefault.Dialog.NoActionBar.MinWidth" parent="Theme.Holo.Dialog.NoActionBar.MinWidth" >



    </style>
@@ -453,7 +453,7 @@ easier. 
    <!-- 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.Quantum.Light.Dialog" >

    <style name="Theme.DeviceDefault.Light.Dialog" parent="Theme.Holo.Light.Dialog" >

        <item name="android:windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault.Light</item>

        <item name="android:windowAnimationStyle">@android:style/Animation.DeviceDefault.Dialog</item>
@@ -465,16 +465,16 @@ easier. 
    </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.Quantum.Light.Dialog.MinWidth" >

    <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="Theme.Holo.Light.Dialog.MinWidth" >



    </style>

     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->

    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="Theme.Quantum.Light.Dialog.NoActionBar" >

    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="Theme.Holo.Light.Dialog.NoActionBar" >



    </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.Quantum.Light.Dialog.NoActionBar.MinWidth" >

    <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="Theme.Holo.Light.Dialog.NoActionBar.MinWidth" >



    </style>
@@ -496,65 +496,65 @@ 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.Quantum.DialogWhenLarge" >

    <style name="Theme.DeviceDefault.DialogWhenLarge" parent="Theme.Holo.DialogWhenLarge" >



    </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.Quantum.DialogWhenLarge.NoActionBar" >

    <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="Theme.Holo.DialogWhenLarge.NoActionBar" >



    </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.Quantum.Light.DialogWhenLarge" >

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="Theme.Holo.Light.DialogWhenLarge" >



    </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.Quantum.Light.DialogWhenLarge.NoActionBar" >

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="Theme.Holo.Light.DialogWhenLarge.NoActionBar" >



    </style>



    <!-- DeviceDefault theme for a presentation window on a secondary display. -->

    <style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Quantum.Dialog.Presentation">

    <style name="Theme.DeviceDefault.Dialog.Presentation" parent="Theme.Holo.Dialog.Presentation">

    </style>



    <!-- DeviceDefault light theme for a presentation window on a secondary display. -->

    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="Theme.Quantum.Light.Dialog.Presentation">

    <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="Theme.Holo.Light.Dialog.Presentation">

    </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.Quantum.Panel" >

    <style name="Theme.DeviceDefault.Panel" parent="Theme.Holo.Panel" >



    </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.Quantum.Light.Panel" >

    <style name="Theme.DeviceDefault.Light.Panel" parent="Theme.Holo.Light.Panel" >



    </style>

    <!-- DeviceDefault theme for windows that want to have the user's selected wallpaper appear

    behind them. -->

    <style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Quantum.Wallpaper" >

    <style name="Theme.DeviceDefault.Wallpaper" parent="Theme.Holo.Wallpaper" >



    </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.Quantum.Wallpaper.NoTitleBar" >

    <style name="Theme.DeviceDefault.Wallpaper.NoTitleBar" parent="Theme.Holo.Wallpaper.NoTitleBar" >



    </style>

    <!-- DeviceDefault style for input methods, which is used by the

         {@link android.inputmethodservice.InputMethodService} class.-->

    <style name="Theme.DeviceDefault.InputMethod" parent="Theme.Quantum.InputMethod" >

    <style name="Theme.DeviceDefault.InputMethod" parent="Theme.Holo.InputMethod" >



    </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.Quantum.Light.DarkActionBar" >

    <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="Theme.Holo.Light.DarkActionBar" >

        <item name="android:actionBarStyle">@android:style/Widget.DeviceDefault.Light.ActionBar.Solid.Inverse</item>



        <item name="actionDropDownStyle">@android:style/Widget.DeviceDefault.Spinner.DropDown.ActionBar</item>
@@ -569,20 +569,20 @@ easier. 


    </style>



    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Quantum.Dialog.Alert">

    <style name="Theme.DeviceDefault.Dialog.Alert" parent="Theme.Holo.Dialog.Alert">

        <item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault</item>

    </style>

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Quantum.Light.Dialog.Alert">

    <style name="Theme.DeviceDefault.Light.Dialog.Alert" parent="Theme.Holo.Light.Dialog.Alert">

        <item name="windowTitleStyle">@android:style/DialogWindowTitle.DeviceDefault.Light</item>

    </style>

    <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Quantum.SearchBar">

    <style name="Theme.DeviceDefault.SearchBar" parent="Theme.Holo.SearchBar">



    </style>

    <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Quantum.Light.SearchBar">

    <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Holo.Light.SearchBar">



    </style>



    <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Quantum.Dialog.NoFrame">

    <style name="Theme.DeviceDefault.Dialog.NoFrame" parent="Theme.Holo.Dialog.NoFrame">

    </style>



</resources>