From d601fba4350ec4c9ca2755068afd8e97c9b86cc6 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Fri, 18 Dec 2020 22:52:26 +0200
Subject: Revert "sdm660-common: doze: Follow Android 10 changes on switchbar"

* Will be replaced by a different commit

This reverts commit e3000073ee3ced9416f6b06cb09e220519e8a692.

Change-Id: I8de333c7953f020e033e23fc8b2594d28b3f1b9b
---
 .../res/color-night/switchbar_switch_thumb_tint.xml | 20 --------------------
 .../res/color-night/switchbar_switch_track_tint.xml | 21 ---------------------
 doze/res/color/switch_bar_bg.xml                    |  2 +-
 doze/res/layout/switch_bar.xml                      |  6 +++---
 4 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 doze/res/color-night/switchbar_switch_thumb_tint.xml
 delete mode 100644 doze/res/color-night/switchbar_switch_track_tint.xml

(limited to 'doze')

diff --git a/doze/res/color-night/switchbar_switch_thumb_tint.xml b/doze/res/color-night/switchbar_switch_thumb_tint.xml
deleted file mode 100644
index e3895a2..0000000
--- a/doze/res/color-night/switchbar_switch_thumb_tint.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 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:color="@android:color/black" />
-</selector>
diff --git a/doze/res/color-night/switchbar_switch_track_tint.xml b/doze/res/color-night/switchbar_switch_track_tint.xml
deleted file mode 100644
index fcccbfc..0000000
--- a/doze/res/color-night/switchbar_switch_track_tint.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2018 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:color="#82000000" />
-</selector>
diff --git a/doze/res/color/switch_bar_bg.xml b/doze/res/color/switch_bar_bg.xml
index cae20c7..ba2dae1 100644
--- a/doze/res/color/switch_bar_bg.xml
+++ b/doze/res/color/switch_bar_bg.xml
@@ -15,6 +15,6 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@*android:color/material_grey_600" android:state_activated="false" />
+    <item android:color="#ff80868B" android:state_activated="false" />
     <item android:color="?android:attr/colorAccent" android:state_activated="true" />
 </selector>
diff --git a/doze/res/layout/switch_bar.xml b/doze/res/layout/switch_bar.xml
index 3307ee1..9e11a0a 100644
--- a/doze/res/layout/switch_bar.xml
+++ b/doze/res/layout/switch_bar.xml
@@ -32,9 +32,9 @@
         android:paddingStart="56dp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
-        android:textColor="?android:attr/textColorPrimaryInverse"
-        android:textSize="16sp"
+        android:textAppearance="@android:style/TextAppearance.Material.Title"
+        android:textColor="@android:color/white"
+        android:textSize="18sp"
         android:textAlignment="viewStart" />
 
     <Switch
-- 
cgit v1.2.3