diff options
author | Bruno Martins <bgcngm@gmail.com> | 2021-01-06 20:51:54 +0000 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2021-02-06 17:19:50 +0200 |
commit | 33048cce9ff8409e7e4adb2500c01631cc739a36 (patch) | |
tree | 7381cb9394cdab97a6c0c5dd1fc3b596142a2a46 | |
parent | e054d17fc466aa15a0a185ea64b3bf89c70d5539 (diff) |
sdm660-common: doze: Use all shared resources from devicesettings
Change-Id: Icd7f381c574ea36eb4d797cefd60ba9f1a0941bd
-rw-r--r-- | doze/Android.bp | 23 | ||||
-rw-r--r-- | doze/Android.mk | 27 | ||||
-rw-r--r-- | doze/res/color/switch_bar_bg.xml | 20 | ||||
-rw-r--r-- | doze/res/drawable/switchbar_background.xml | 20 | ||||
-rw-r--r-- | doze/res/layout/switch_bar.xml | 50 | ||||
-rw-r--r-- | doze/res/values-night/colors.xml | 20 | ||||
-rw-r--r-- | doze/res/values/colors.xml | 21 | ||||
-rw-r--r-- | doze/res/values/styles.xml | 72 |
8 files changed, 23 insertions, 230 deletions
diff --git a/doze/Android.bp b/doze/Android.bp new file mode 100644 index 0000000..ef39d6b --- /dev/null +++ b/doze/Android.bp @@ -0,0 +1,23 @@ +// +// Copyright (C) 2020-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 817df97..0000000 --- a/doze/Android.mk +++ /dev/null @@ -1,27 +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.core_core \ - androidx.preference_preference - -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - $(TOP)/packages/resources/devicesettings/res - -LOCAL_PROGUARD_FLAG_FILES := proguard.flags - -include frameworks/base/packages/SettingsLib/common.mk - -include $(BUILD_PACKAGE) diff --git a/doze/res/color/switch_bar_bg.xml b/doze/res/color/switch_bar_bg.xml deleted file mode 100644 index ca13e3c..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-2020 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="@color/switchbar_background_color" android:state_activated="false" /> - <item android:color="?android:attr/colorAccent" android:state_activated="true" /> -</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 e02f196..0000000 --- a/doze/res/layout/switch_bar.xml +++ /dev/null @@ -1,50 +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:clickable="true" - android:gravity="center" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:theme="@*android:style/ThemeOverlay.DeviceDefault.Accent"> - - <TextView - android:id="@+id/switch_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:ellipsize="end" - android:maxLines="2" - android:paddingStart="56dp" - android:textAlignment="viewStart" - android:textAppearance="@android:style/TextAppearance.Material.Title" - android:textColor="?android:attr/textColorPrimaryInverse" - android:textSize="18sp" /> - - <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-night/colors.xml b/doze/res/values-night/colors.xml deleted file mode 100644 index 6d9d63e..0000000 --- a/doze/res/values-night/colors.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2020 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> - <color name="switchbar_switch_thumb_tint">@android:color/black</color> - <color name="switchbar_switch_track_tint">#82000000</color> -</resources> diff --git a/doze/res/values/colors.xml b/doze/res/values/colors.xml deleted file mode 100644 index ac4c4c3..0000000 --- a/doze/res/values/colors.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2020 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> - <color name="switchbar_background_color">@*android:color/material_grey_600</color> - <color name="switchbar_switch_thumb_tint">@android:color/white</color> - <color name="switchbar_switch_track_tint">#BFFFFFFF</color> -</resources> diff --git a/doze/res/values/styles.xml b/doze/res/values/styles.xml deleted file mode 100644 index 4ee4de4..0000000 --- a/doze/res/values/styles.xml +++ /dev/null @@ -1,72 +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" parent="@style/PreferenceThemeOverlay.SettingsBase"> - <item name="preferenceCategoryTitleTextAppearance"> - @style/Theme.Main.TextAppearance.CategoryTitle - </item> - </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> - - <style name="Theme.Main.TextAppearance.CategoryTitle" - parent="@*android:style/TextAppearance.DeviceDefault.Body2"> - <!-- 0.8 Spacing, 0.8/11 = 0.072727273 --> - <item name="android:letterSpacing">0.072727273</item> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">11sp</item> - </style> -</resources> |