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

Commit 1f834959 authored by Jakub Adamek's avatar Jakub Adamek Committed by android-build-merger
Browse files

Revert "Adding customizable background colour support." 

am: 91181aa5

Change-Id: I47bf7b13426ef866848aa3546f1dead89ed9669d
parents c325a5be 91181aa5

core/res/res/color/background_cache_hint_selector_device_default.xml

deleted100644 → 0
+0 −20
Original line number Original line Diff line number Diff line 
<?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.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:state_accelerated="false" android:color="?attr/colorBackground" />

    <item android:color="@android:color/transparent" />

</selector>

core/res/res/values-watch/themes_device_defaults.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,12 +32,12 @@ easier. 
 -->

 -->

<resources>

<resources>

    <!-- Theme used for the intent picker activity. -->

    <!-- Theme used for the intent picker activity. -->

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

    <style name="Theme.DeviceDefault.Resolver" parent="Theme.Material">

        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="colorControlActivated">?attr/colorControlHighlight</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingStart">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>

        <item name="listPreferredItemPaddingEnd">?attr/dialogPreferredPadding</item>

    </style>

    </style>





    <!-- Use a dark theme for watches. -->

    <!-- Use a dark theme for watches. -->

    <style name="Theme.DeviceDefault.System" />

    <style name="Theme.DeviceDefault.System" parent="Theme.Material" />

</resources>
 
</resources>

core/res/res/values/colors_device_defaults.xml

+0 −7
Original line number Original line Diff line number Diff line
@@ -32,11 +32,4 @@ 
    <color name="accent_device_default_light">@color/accent_material_light</color>

    <color name="accent_device_default_light">@color/accent_material_light</color>

    <color name="accent_device_default_dark">@color/accent_material_dark</color>

    <color name="accent_device_default_dark">@color/accent_material_dark</color>

    <color name="accent_device_default_50">@color/material_deep_teal_50</color>

    <color name="accent_device_default_50">@color/material_deep_teal_50</color>



    <color name="background_device_default_dark">@color/background_material_dark</color>

    <color name="background_device_default_light">@color/background_material_light</color>

    <color name="background_floating_device_default_dark">@color/background_floating_material_dark</color>

    <color name="background_floating_device_default_light">@color/background_floating_material_light</color>

    <color name="button_normal_device_default_dark">@color/btn_default_material_dark</color>

    <color name="button_normal_device_default_light">@color/btn_default_material_light</color>

</resources>
 
</resources>

core/res/res/values/themes_device_defaults.xml

+138 −128

File changed.

Preview size limit exceeded, changes collapsed.