From b48ae7adc5b83705df7b4aea1ba60dcc386372d2 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Wed, 6 Jan 2021 20:51:54 +0000
Subject: [PATCH] onclite: doze: Use all shared resources from devicesettings
Change-Id: Icd7f381c574ea36eb4d797cefd60ba9f1a0941bd
---
doze/Android.bp | 23 +++++++
doze/Android.mk | 26 --------
.../switchbar_switch_thumb_tint.xml | 20 ------
.../switchbar_switch_track_tint.xml | 21 -------
doze/res/color/switch_bar_bg.xml | 20 ------
.../res/color/switchbar_switch_thumb_tint.xml | 20 ------
.../res/color/switchbar_switch_track_tint.xml | 21 -------
doze/res/drawable/switchbar_background.xml | 20 ------
doze/res/layout/switch_bar.xml | 48 --------------
doze/res/values/styles.xml | 62 -------------------
10 files changed, 23 insertions(+), 258 deletions(-)
create mode 100644 doze/Android.bp
delete mode 100644 doze/Android.mk
delete mode 100644 doze/res/color-night/switchbar_switch_thumb_tint.xml
delete mode 100644 doze/res/color-night/switchbar_switch_track_tint.xml
delete mode 100644 doze/res/color/switch_bar_bg.xml
delete mode 100644 doze/res/color/switchbar_switch_thumb_tint.xml
delete mode 100644 doze/res/color/switchbar_switch_track_tint.xml
delete mode 100644 doze/res/drawable/switchbar_background.xml
delete mode 100644 doze/res/layout/switch_bar.xml
delete mode 100644 doze/res/values/styles.xml
diff --git a/doze/Android.bp b/doze/Android.bp
new file mode 100644
index 0000000..99d29a6
--- /dev/null
+++ b/doze/Android.bp
@@ -0,0 +1,23 @@
+//
+// Copyright (C) 2017-2021 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+android_app {
+ name: "XiaomiDoze",
+
+ srcs: ["src/**/*.java"],
+ resource_dirs: ["res"],
+ certificate: "platform",
+ platform_apis: true,
+ privileged: true,
+
+ static_libs: [
+ "org.lineageos.settings.resources",
+ ],
+
+ optimize: {
+ proguard_flags_files: ["proguard.flags"],
+ },
+}
diff --git a/doze/Android.mk b/doze/Android.mk
deleted file mode 100644
index 90539d3..0000000
--- a/doze/Android.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := XiaomiDoze
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_PRIVILEGED_MODULE := true
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
- androidx.preference_preference
-
-LOCAL_RESOURCE_DIR := \
- $(LOCAL_PATH)/res \
- $(TOP)/packages/resources/devicesettings/res
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
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
deleted file mode 100644
index cae20c7..0000000
--- a/doze/res/color/switch_bar_bg.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS 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/material_grey_600" android:state_activated="false" />
- <item android:color="?android:attr/colorAccent" android:state_activated="true" />
-</selector>
diff --git a/doze/res/color/switchbar_switch_thumb_tint.xml b/doze/res/color/switchbar_switch_thumb_tint.xml
deleted file mode 100644
index d4bf9b3..0000000
--- a/doze/res/color/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="#FFFFFF" />
-</selector>
diff --git a/doze/res/color/switchbar_switch_track_tint.xml b/doze/res/color/switchbar_switch_track_tint.xml
deleted file mode 100644
index ae45c7a..0000000
--- a/doze/res/color/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="#BFFFFFFF" />
-</selector>
diff --git a/doze/res/drawable/switchbar_background.xml b/doze/res/drawable/switchbar_background.xml
deleted file mode 100644
index f210707..0000000
--- a/doze/res/drawable/switchbar_background.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS 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.
--->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@color/switch_bar_bg" />
-</shape>
diff --git a/doze/res/layout/switch_bar.xml b/doze/res/layout/switch_bar.xml
deleted file mode 100644
index 3307ee1..0000000
--- a/doze/res/layout/switch_bar.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/switch_bar"
- android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="@drawable/switchbar_background"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:clickable="true"
- android:gravity="center">
-
- <TextView android:id="@+id/switch_text"
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_gravity="center_vertical"
- 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:textAlignment="viewStart" />
-
- <Switch
- android:id="@android:id/switch_widget"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:background="@null"
- android:theme="@style/Theme.Main.SwitchBar.Switch" />
-
-</LinearLayout>
diff --git a/doze/res/values/styles.xml b/doze/res/values/styles.xml
deleted file mode 100644
index 3443c0b..0000000
--- a/doze/res/values/styles.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2015-2016 The CyanogenMod Project
- 2017 The LineageOS 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <style name="Theme.Main" parent="@android:style/Theme.DeviceDefault.Settings">
- <item name="dialogPreferenceStyle">@style/Theme.Main.DialogPreferenceStyle</item>
- <item name="preferenceCategoryStyle">@style/Theme.Main.PreferenceCategoryStyle</item>
- <item name="preferenceFragmentStyle">@style/Theme.Main.PreferenceFragmentStyle</item>
- <item name="preferenceStyle">@style/Theme.Main.PreferenceStyle</item>
- <item name="preferenceTheme">@style/Theme.Main.PreferenceTheme</item>
- <item name="switchPreferenceStyle">@style/Theme.Main.SwitchPreferenceStyle</item>
- </style>
-
- <style name="Theme.Main.DialogPreferenceStyle" parent="@style/Theme.Main.PreferenceStyle">
- </style>
-
- <style name="Theme.Main.PreferenceCategoryStyle" parent="@*android:style/Preference.DeviceDefault.Category">
- <item name="allowDividerAbove">true</item>
- <item name="allowDividerBelow">true</item>
- <item name="android:layout">@layout/preference_category_material_settings</item>
- </style>
-
- <style name="Theme.Main.PreferenceFragmentStyle" parent="@*android:style/PreferenceFragment.Material">
- <item name="allowDividerAfterLastItem">false</item>
- </style>
-
- <style name="Theme.Main.PreferenceStyle" parent="@*android:style/Preference.DeviceDefault">
- <item name="allowDividerAbove">false</item>
- <item name="allowDividerBelow">true</item>
- <item name="singleLineTitle">false</item>
- <item name="android:layout">@layout/preference_material_settings</item>
- </style>
-
- <style name="Theme.Main.PreferenceTheme">
- </style>
-
- <style name="Theme.Main.SwitchPreferenceStyle" parent="@style/Theme.Main.PreferenceStyle">
- <item name="widgetLayout">@*android:layout/preference_widget_switch</item>
- </style>
-
- <style name="Theme.Main.SwitchBar" parent="@android:style/ThemeOverlay.Material.ActionBar">
- </style>
-
- <style name="Theme.Main.SwitchBar.Switch">
- <item name="android:trackTint">@color/switchbar_switch_track_tint</item>
- <item name="android:thumbTint">@color/switchbar_switch_thumb_tint</item>
- </style>
-</resources>
--
GitLab