sdm660-common: Tricking out device specific settings

* Rebrand to DeviceDoze
* Keep class for DeviceSettings

Signed-off-by: OdSazib <odsazib@gmail.com>

DeviceDoze/Android.mk

@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_PACKAGE_NAME := XiaomiDoze
+LOCAL_PACKAGE_NAME := DeviceDoze
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_PRIVILEGED_MODULE := true

DeviceDoze/AndroidManifest.xml

@@ -16,9 +16,9 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.lineageos.settings.doze"
+    package="com.advanced.settings.doze"
-    android:versionCode="1"
+    android:versionCode="2"
-    android:versionName="1.0"
+    android:versionName="2.0"
     android:sharedUserId="android.uid.system">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
@@ -42,7 +42,7 @@
         </receiver>
 
         <service android:name=".DozeService"
-                 android:permission="XiaomiDozeService">
+                 android:permission="DeviceDozeService">
         </service>
 
         <activity
@@ -50,13 +50,13 @@
             android:label="@string/ambient_display_title"
             android:theme="@style/Theme.Main">
             <intent-filter>
-                <action android:name="org.lineageos.settings.device.DOZE_SETTINGS" />
+                <action android:name="com.my.device.parts.DOZE_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         
         <service
-            android:name="org.lineageos.settings.doze.DozeTileService"
+            android:name="com.advanced.settings.doze.DozeTileService"
             android:icon="@drawable/ic_doze"
             android:label="@string/ambient_display_gestures_title"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">

DeviceDoze/proguard.flags

@@ -0,0 +1,3 @@
+-keep class com.advanced.settings.doze.* {
+  *;
+}

DeviceDoze/res/color-night/switchbar_switch_thumb_tint.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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>

DeviceDoze/res/color-night/switchbar_switch_track_tint.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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>

DeviceDoze/res/color/switch_bar_bg.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

DeviceDoze/res/color/switchbar_switch_thumb_tint.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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>

DeviceDoze/res/color/switchbar_switch_track_tint.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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>

DeviceDoze/res/drawable/ic_hand_wave.xml

@@ -0,0 +1,9 @@
+<!-- drawable/arrow-decision_auto -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+   <path android:fillColor="#FFFFFFFF" android:pathData="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
+</vector>

DeviceDoze/res/drawable/ic_raise.xml

@@ -0,0 +1,9 @@
+<!-- drawable/arrow_decision_outline.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal" >
+    <path android:fillColor="#FFFFFFFF" android:pathData="M9.64,13.4C8.63,12.5 7.34,12.03 6,12V15L2,11L6,7V10C7.67,10 9.3,10.57 10.63,11.59C10.22,12.15 9.89,12.76 9.64,13.4M18,15V12C17.5,12 13.5,12.16 13.05,16.2C14.61,16.75 15.43,18.47 14.88,20.03C14.33,21.59 12.61,22.41 11.05,21.86C9.5,21.3 8.67,19.59 9.22,18.03C9.5,17.17 10.2,16.5 11.05,16.2C11.34,12.61 14.4,9.88 18,10V7L22,11L18,15M13,19A1,1 0 0,0 12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19M11,11.12C11.58,10.46 12.25,9.89 13,9.43V5H16L12,1L8,5H11V11.12Z" />
+</vector>

DeviceDoze/res/drawable/switchbar_background.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The LineageOS Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

DeviceDoze/res/layout/doze.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
+     
+     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:orientation="vertical"
+              android:layout_height="match_parent"
+              android:layout_width="match_parent">
+
+    <include layout="@layout/switch_bar" />
+
+</LinearLayout>
+

DeviceDoze/res/layout/preference_category_material_settings.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-  Copyright (C) 2016 The Android Open Source Project
+
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

DeviceDoze/res/layout/preference_material_settings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

DeviceDoze/res/layout/switch_bar.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

DeviceDoze/res/values-es-rES/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-     Copyright (C) 2013-2016 The CyanogenMod Project
+
-               (C) 2017 The LineageOS Project
+     https://github.com/xiaomi-sdm660
+     
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">Activado</string>

DeviceDoze/res/values-pt-rBR/strings.xml

@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-     Copyright (C) 2013-2016 The CyanogenMod Project
+
-               (C) 2017 The LineageOS Project
+     https://github.com/xiaomi-sdm660
+     
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">Ligado</string>

DeviceDoze/res/values-ru-rRU/strings.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-<!--
+
-     Copyright (C) 2013-2016 The CyanogenMod Project
+     https://github.com/xiaomi-sdm660
-               (C) 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.
@@ -16,6 +15,7 @@
      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">
   <!-- Label for feature switch [CHAR LIMIT=30] -->
   <string name="switch_bar_on">Включено</string>

DeviceDoze/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-     Copyright (C) 2013-2016 The CyanogenMod Project
+
-               (C) 2017 The LineageOS Project
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
      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">
     <!-- Label for feature switch [CHAR LIMIT=30] -->
     <string name="switch_bar_on">On</string>
@@ -23,10 +24,10 @@
     <string name="switch_bar_off">Off</string>
 
     <!-- Device specific settings -->
-    <string name="device_settings_app_name">Advanced settings</string>
+    <string name="device_settings_app_name">Advanced Doze Settings</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_title">Ambient display</string>
+    <string name="ambient_display_title">Ambient Display</string>
 
     <!-- Tilt sensor -->
     <string name="tilt_sensor_title">Tilt Sensor Gestures</string>
@@ -35,11 +36,11 @@
     <string name="proximity_sensor_title">Proximity Sensor Gestures</string>
 
     <!-- Hand wave gesture -->
-    <string name="hand_wave_gesture_title">Hand wave</string>
+    <string name="hand_wave_gesture_title">Hand Wave</string>
     <string name="hand_wave_gesture_summary">Pulse notifications on hand wave</string>
 
     <!-- Pick-up gesture -->
-    <string name="pick_up_gesture_title">Pick-up</string>
+    <string name="pick_up_gesture_title">Pick-Up</string>
     <string name="pick_up_gesture_summary">Pulse notifications on pick-up</string>
 
     <!-- Pocket gesture -->
@@ -47,7 +48,7 @@
     <string name="pocket_gesture_summary">Pulse notifications on removal from pocket</string>
 
     <!-- Proximity wake -->
-    <string name="proximity_wake_title">Proximity wake</string>
+    <string name="proximity_wake_title">Proximity Wake</string>
     <string name="proximity_wake_enable_summary">Wake device on hand wave</string>
 
     <!-- Dialog texts -->

DeviceDoze/res/values/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-     Copyright (C) 2015-2016 The CyanogenMod Project
+
-                   2017 The LineageOS Project
+     https://github.com/xiaomi-sdm660
      
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
      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>

DeviceDoze/res/xml/doze_settings.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
+<!-- Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
-     Copyright (C) 2015 The CyanogenMod Project
 
-     Licensed under the Apache License, Version 2.0 (the "License"
+     https://github.com/xiaomi-sdm660
+     
+     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
 
@@ -14,6 +15,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
     <PreferenceCategory
@@ -44,7 +46,7 @@
         <SwitchPreference
             android:key="gesture_hand_wave"
             android:defaultValue="false"
-            android:icon="@drawable/ic_wave"
+            android:icon="@drawable/ic_hand_wave"
             android:title="@string/hand_wave_gesture_title"
             android:summary="@string/hand_wave_gesture_summary" />
 

DeviceDoze/src/com/advanced/settings/doze/BootCompletedReceiver.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,7 +26,7 @@ import android.util.Log;
 public class BootCompletedReceiver extends BroadcastReceiver {
 
     private static final boolean DEBUG = false;
-    private static final String TAG = "XiaomiDoze";
+    private static final String TAG = "DeviceDoze";
 
     @Override
     public void onReceive(final Context context, Intent intent) {

DeviceDoze/src/com/advanced/settings/doze/DozeService.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017-2018 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.app.Service;
 import android.content.BroadcastReceiver;

DeviceDoze/src/com/advanced/settings/doze/DozeSettingsActivity.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015-2016 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;

DeviceDoze/src/com/advanced/settings/doze/DozeSettingsFragment.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017-2018 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.app.ActionBar;
 import android.app.Activity;

DeviceDoze/src/com/advanced/settings/doze/DozeTileService.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
+ *
+ *  https://github.com/xiaomi-sdm660
+ *
+ * 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
+ */
+
+package com.advanced.settings.doze;
+
+import android.annotation.TargetApi;
+import android.content.Intent;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+
+import com.advanced.settings.doze.R;
+
+@TargetApi(24)
+public class DozeTileService extends TileService {
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onTileAdded() {
+        super.onTileAdded();
+    }
+
+    @Override
+    public void onTileRemoved() {
+        super.onTileRemoved();
+    }
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+    }
+
+    @Override
+    public void onStopListening() {
+        super.onStopListening();
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        Intent DeviceDoze = new Intent(this, DozeSettingsActivity.class);
+        DeviceDoze.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivityAndCollapse(DeviceDoze);
+    }
+}

DeviceDoze/src/com/advanced/settings/doze/ProximitySensor.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (c) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017-2018 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;

DeviceDoze/src/com/advanced/settings/doze/TiltSensor.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (c) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017-2018 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.hardware.Sensor;

DeviceDoze/src/com/advanced/settings/doze/Utils.java

@@ -1,6 +1,7 @@
 /*
- * Copyright (C) 2015 The CyanogenMod Project
+ * Copyright (C) 2018-2020 The Xiaomi-SDM660 Project
- *               2017-2018 The LineageOS Project
+ *
+ *  https://github.com/xiaomi-sdm660
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -12,10 +13,10 @@
  * 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.
+ * limitations under the License
  */
 
-package org.lineageos.settings.doze;
+package com.advanced.settings.doze;
 
 import android.content.Context;
 import android.content.Intent;

DeviceSettings/Android.mk

@@ -7,7 +7,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
     androidx.preference_preference
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := XiaomiParts
+LOCAL_PACKAGE_NAME := DeviceSettings
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_PRIVATE_PLATFORM_APIS := true
@@ -16,14 +16,13 @@ LOCAL_USE_AAPT2 := true
 
 package_resource_overlays := $(strip \
     $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/XiaomiParts/res))) \
+      $(addprefix $(dir)/, packages/apps/DeviceSettings/res))) \
     $(wildcard $(foreach dir, $(DEVICE_PACKAGE_OVERLAYS), \
-      $(addprefix $(dir)/, packages/apps/XiaomiParts/res))))
+      $(addprefix $(dir)/, packages/apps/DeviceSettings/res))))
 
 LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)
 
-LOCAL_PROGUARD_ENABLED := disabled
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_DEX_PREOPT := false
 
 include frameworks/base/packages/SettingsLib/common.mk
 

DeviceSettings/AndroidManifest.xml

@@ -45,7 +45,7 @@
         <activity
             android:name=".DeviceSettingsActivity"
             android:exported="false"
-            android:icon="@drawable/ic_mi"
+            android:icon="@drawable/ic_device"
             android:label="@string/advanced_settings"
             android:launchMode="singleTask">
             <intent-filter>

DeviceSettings/proguard.flags

@@ -0,0 +1,3 @@
+-keep class org.lineageos.settings.device.* {
+  *;
+}

DeviceSettings/res/drawable/ic_device.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M17,1L7,1C5.9,1,5,1.9,5,3v2h2v4H5v12c0,1.1,0.9,2,2,2h10c1.1,0,2-0.9,2-2V3C19,1.9,18.1,1,17,1z M11,21H7v-2h4V21z M17,21 h-4v-2h4V21z" />
+</vector>

DeviceSettings/res/values-de-rDE/strings.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Erweiterte Einstellungen</string>
     <string name="display_title">Display</string>
     <string name="device_kcal_title">Displaykalibierung</string>

DeviceSettings/res/values-es-rES/strings.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
+    <string name="advanced_settings">Ajustes Device</string>
     <string name="advanced_settings_summary">Ajustes adicionales</string>
 
     <string name="display_title">Pantalla</string>
@@ -31,8 +31,8 @@
     <string name="notification_led_title">Brillo del LED</string>
 
      <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Doze de xiaomi</string>
+    <string name="ambient_display">Pantalla ambiente</string>
-    <string name="advanced_doze_summary">Pantalla ambiente</string>
+    <string name="advanced_doze_summary">Ajustes pantalla ambiente</string>
      
     <!-- Thermal Profiles -->
     <string name="thermal_profile_title">Rendimiento</string>

DeviceSettings/res/values-es-rMX/strings.xml

@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
+    <string name="advanced_settings">Ajustes Device</string>
-    <string name="advanced_settings_summary">Ajustes Extras de Xiaomi MI 6X/A2</string>
+    <string name="advanced_settings_summary">Ajustes extras de device</string>
 
     <string name="display_title">Pantalla</string>
 

DeviceSettings/res/values-ja-rJP/strings.xml

@@ -23,8 +23,8 @@
     <string name="device_kcal_title">画面の色補正</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">アンビエント画面</string>
-    <string name="advanced_doze_summary">アンビエント画面</string>
+    <string name="advanced_doze_summary">追加の設定アンビエント画面</string>
 
     <string name="vibration_title">振動フィードバック</string>
     <string name="vibration_strength_title">強さ</string>

DeviceSettings/res/values-ko-rKR/strings.xml

@@ -25,7 +25,7 @@
     <string name="device_kcal_title">디스플레이 컬러 캘리브레이션</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">앰비언트 디스플레이</string>
     <string name="advanced_doze_summary">앰비언트 디스플레이</string>
 
     <string name="vibration_title">햅틱 피드백</string>

DeviceSettings/res/values-pt-rBR/strings.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Configurações adicionais</string>
     
     <string name="display_title">Display</string>
@@ -31,8 +31,8 @@
     <string name="notification_led_title">Brilho do LED</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">Tela Ambiente</string>
-    <string name="advanced_doze_summary">Tela Ambiente</string>
+    <string name="advanced_doze_summary">Configurações do dispositivo tela ambiente</string>
     
     <string name="vibration_title">Feedback tátil</string>
     <string name="vibration_strength_title">Força</string>

DeviceSettings/res/values-ru-rRU/strings.xml

@@ -16,7 +16,7 @@
 	 Translated with <3 by pqhaz
 -->
 <resources>
-    <string name="advanced_settings">Настройки Xiaomi</string>
+    <string name="advanced_settings">Настройки Device</string>
     <string name="advanced_settings_summary">Дополнительные настройки</string>
 
     <string name="display_title">Экран</string>
@@ -25,8 +25,8 @@
     <string name="device_kcal_title">Калибрация цвета экрана</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Дозе Xiaomi</string>
+    <string name="ambient_display">Ambient экран</string>
-    <string name="advanced_doze_summary">Ambient экран</string>
+    <string name="advanced_doze_summary">Дополнительные ambient экран</string>
 
     <string name="vibration_title">Вибрация</string>
     <string name="vibration_strength_title">Сила</string>

DeviceSettings/res/values-sk-rSK/strings.xml

@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
     <string name="advanced_settings_summary">Rozšírené nastavenia</string>
     <string name="display_title">Displej</string>
     <string name="device_kcal_title">Kalibrácia farieb</string>

DeviceSettings/res/values-zh-rCN/strings.xml

@@ -23,8 +23,8 @@
     <string name="device_kcal_title">显示颜色矫正</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">环境显示</string>
-    <string name="advanced_doze_summary">环境显示</string>
+    <string name="advanced_doze_summary">环境显示附加设置</string>
 
     <string name="vibration_title">触觉反馈</string>
     <string name="vibration_strength_title">强度</string>

DeviceSettings/res/values/strings.xml

@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <string name="advanced_settings">Xiaomi Parts</string>
+    <string name="advanced_settings">Device Settings</string>
-    <string name="advanced_settings_summary">Extra Settings</string>
+    <string name="advanced_settings_summary">Device specific advanced settings</string>
 
     <string name="display_title">Display</string>
 
@@ -31,10 +31,10 @@
     <string name="notification_led_title">LED brightness</string>
 
     <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
+    <string name="ambient_display">Ambient Display</string>
-    <string name="advanced_doze_summary">Ambient Display</string>
+    <string name="advanced_doze_summary">Device specific ambient gesture settings</string>
 
-    <string name="vibration_title">Haptic feedback</string>
+    <string name="vibration_title">Haptic Feedback</string>
     <string name="vibration_strength_title">Strength</string>
 
     <!-- Thermal Profiles -->
@@ -90,16 +90,17 @@
     <string name="kcal_reset">Reset</string>
 
     <!-- CustomSeekBarPreference -->
-    <string name="edit_value">Choose new Value</string>
+    <string name="edit_value">Choose new value</string>
-    <string name="default_value">Default Value</string>
+    <string name="default_value">Default value</string>
     <string name="edit_hint">Value between %1$d and %2$d</string>
 
     <!-- FPS Info -->
     <string name="fps_info_title">FPS Overlay</string>
-    <string name="fps_info_summary">Show overlay with with current frames per second</string>
+    <string name="fps_info_summary">Show overlay with current frames per second</string>
     
     <!-- Audio amplification -->
     <string name="audio_amplify">Amplify Audio</string>
     <string name="headphone_gain">Headphone Gain</string>
     <string name="mic_gain">Microphone Gain</string>
+
 </resources>

DeviceSettings/res/xml/preferences_xiaomi_parts.xml

@@ -65,6 +65,17 @@
         android:key="display"
         android:title="@string/display_title">
 
+        <Preference
+            android:key="device_doze"
+            android:persistent="false"
+            android:summary="@string/advanced_doze_summary"
+            android:title="@string/ambient_display"
+            android:icon="@drawable/ic_doze">
+            <intent
+                android:action="android.intent.action.MAIN"
+                android:targetClass="com.advanced.settings.doze.DozeSettingsActivity"
+                android:targetPackage="com.advanced.settings.doze" />
+        </Preference>
         <Preference
             android:key="device_kcal"
             android:persistent="false"
@@ -75,18 +86,6 @@
                 android:targetClass="org.lineageos.settings.kcal.KCalSettingsActivity"
                 android:targetPackage="org.lineageos.settings.kcal" />
         </Preference>
-
-        <Preference
-            android:key="device_doze"
-            android:persistent="false"
-            android:summary="@string/advanced_doze_summary"
-            android:title="@string/ambient_display_xiaomi"
-            android:icon="@drawable/ic_doze">
-            <intent
-                android:action="android.intent.action.MAIN"
-                android:targetClass="org.lineageos.settings.doze.DozeSettingsActivity"
-                android:targetPackage="org.lineageos.settings.doze" />
-        </Preference>
         <SwitchPreference
             android:key="fps_info"
             android:icon="@drawable/ic_fps_info"

DeviceSettings/src/org/lineageos/settings/device/DeviceSettings.java

@@ -74,7 +74,7 @@ public class DeviceSettings extends PreferenceFragment implements
     public static final String HALL_WAKEUP_PATH = "/sys/module/hall/parameters/hall_toggle";
     public static final String HALL_WAKEUP_PROP = "persist.service.folio_daemon";
 
-    private static final String DEVICE_DOZE_PACKAGE_NAME = "org.lineageos.settings.doze";
+    private static final String DEVICE_DOZE_PACKAGE_NAME = "com.advanced.settings.doze";
 
     private static final String DEVICE_JASON_PACKAGE_NAME = "org.lineageos.settings.devicex";
     private static final String PREF_DEVICE_JASON = "device_jason";

DeviceSettings/src/org/lineageos/settings/device/preferences/NotificationLedSeekBarPreference.java

@@ -16,7 +16,7 @@ public class NotificationLedSeekBarPreference extends SecureSettingCustomSeekBar
     @Override
     public void onStartTrackingTouch(SeekBar seekBar) {
         notifyChanged();
-        FileUtils.setValue(NOTIF_LED_PATH, 64);
+        FileUtils.setValue(NOTIF_LED_PATH, 255);
     }
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {

XiaomiDoze/proguard.flags

@@ -1,3 +0,0 @@
--keep class org.lineageos.settings.doze.* {
-  *;
-}

XiaomiDoze/res/color-night/switchbar_switch_thumb_tint.xml

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

XiaomiDoze/res/color-night/switchbar_switch_track_tint.xml

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

XiaomiDoze/res/color/switchbar_switch_thumb_tint.xml

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

XiaomiDoze/res/color/switchbar_switch_track_tint.xml

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

XiaomiDoze/res/drawable/ic_raise.xml

@@ -1,9 +0,0 @@
-<!-- drawable/arrow_decision_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal" >
-    <path android:fillColor="#000" android:pathData="M9.64,13.4C8.63,12.5 7.34,12.03 6,12V15L2,11L6,7V10C7.67,10 9.3,10.57 10.63,11.59C10.22,12.15 9.89,12.76 9.64,13.4M18,15V12C17.5,12 13.5,12.16 13.05,16.2C14.61,16.75 15.43,18.47 14.88,20.03C14.33,21.59 12.61,22.41 11.05,21.86C9.5,21.3 8.67,19.59 9.22,18.03C9.5,17.17 10.2,16.5 11.05,16.2C11.34,12.61 14.4,9.88 18,10V7L22,11L18,15M13,19A1,1 0 0,0 12,18A1,1 0 0,0 11,19A1,1 0 0,0 12,20A1,1 0 0,0 13,19M11,11.12C11.58,10.46 12.25,9.89 13,9.43V5H16L12,1L8,5H11V11.12Z" />
-</vector>

XiaomiDoze/res/drawable/ic_wave.xml

@@ -1,9 +0,0 @@
-<!-- drawable/arrow-decision_auto -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorControlNormal">
-   <path android:fillColor="#000" android:pathData="M21,6.58V18.67A3.33,3.33 0 0,1 17.67,22H11.58C10.68,22 9.83,21.64 9.21,21L2.67,14.36C2.67,14.36 3.72,13.33 3.75,13.32C3.93,13.16 4.16,13.07 4.41,13.07C4.59,13.07 4.76,13.12 4.91,13.21C4.94,13.22 8.5,15.26 8.5,15.26V5.33A1.25,1.25 0 0,1 9.75,4.08A1.25,1.25 0 0,1 11,5.33V11.17H11.83V3.25A1.25,1.25 0 0,1 13.08,2C13.78,2 14.33,2.56 14.33,3.25V11.17H15.17V4.08C15.17,3.39 15.72,2.83 16.42,2.83A1.25,1.25 0 0,1 17.67,4.08V11.17H18.5V6.58A1.25,1.25 0 0,1 19.75,5.33A1.25,1.25 0 0,1 21,6.58Z" />
-</vector>

XiaomiDoze/res/layout/doze.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2014, 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:orientation="vertical"
-              android:layout_height="match_parent"
-              android:layout_width="match_parent">
-
-    <include layout="@layout/switch_bar" />
-
-</LinearLayout>
-

XiaomiDoze/src/org/lineageos/settings/doze/DozeTileService.java

@@ -1,61 +0,0 @@
-/*
-* Copyright (C) 2019-20 Evolution X Project
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.lineageos.settings.doze;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-
-import org.lineageos.settings.doze.R;
-
-@TargetApi(24)
-public class DozeTileService extends TileService {
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    @Override
-    public void onTileAdded() {
-        super.onTileAdded();
-    }
-
-    @Override
-    public void onTileRemoved() {
-        super.onTileRemoved();
-    }
-
-    @Override
-    public void onStartListening() {
-        super.onStartListening();
-    }
-
-    @Override
-    public void onStopListening() {
-        super.onStopListening();
-    }
-
-    @Override
-    public void onClick() {
-        super.onClick();
-        Intent XiaomiDoze = new Intent(this, DozeSettingsActivity.class);
-        XiaomiDoze.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivityAndCollapse(XiaomiDoze);
-    }
-}

XiaomiParts/res/drawable/ic_mi.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M4,6.771l2.529,0.028l6.297,0c1.6,0 2.683,1.428 2.684,2.922c0.002,2.386
-0.028,7.48 0.028,7.48l-2.454,0.01l-0.046,-6.7c-0.006,-0.935 -0.634,-1.542
--1.548,-1.555c-1.177,-0.017 -4.163,0.019
--4.961,0.029l0,8.244l-2.529,0l0,-10.458Zm4.462,4.035l2.586,0l0,6.338l-2.586,0l0,-6.338Zm9.009,-4.035l2.529,0l0,10.458l-2.529,0l0,-10.458Z" />
-</vector>
-

XiaomiParts/res/values-es-rMX/strings.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Xiaomi-SDM660 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>
-    <string name="advanced_settings">Ajustes Xiaomi</string>
-    <string name="advanced_settings_summary">Ajustes Extras de Xiaomi MI 6X/A2</string>
-
-    <string name="display_title">Pantalla</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">Calibrar Color de Pantalla </string>
-
-    <string name="vibration_title">Retroalimentación háptica</string>
-    <string name="vibration_strength_title">Fuerza</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">Rendimiento</string>
-    <string name="thermal_title">Ajustes de Rendimiento</string>
-    <string name="thermal_summary">Elija su configuración de Rendimiento</string>
-    <string name="thermal_dialogTitle">Elija su configuración de Rendimiento</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">Rendimiento</string>
-    <string name="thermal_battery">Batería</string>
-    <string name="thermal_gaming">Juego</string>
-    <string name="thermal_balance">Balance</string>
-    <string name="thermal_extreme_battery">Batería Extrema</string>
-</resources>

XiaomiParts/res/values-ru/strings.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Xiaomi-SDM660 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.
-	 
-	 Translated with <3 by pqhaz
--->
-<resources>
-    <string name="advanced_settings">Настройки Xiaomi</string>
-    <string name="advanced_settings_summary">Дополнительные настройки</string>
-
-    <string name="display_title">Экран</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">Калибрация цвета экрана</string>
-
-    <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Индикация событий</string>
-    <string name="advanced_doze_summary">Ambient экран</string>
-
-    <string name="vibration_title">Вибрация</string>
-    <string name="vibration_strength_title">Сила</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">Производительность</string>
-    <string name="thermal_title">Настройки производительности</string>
-    <string name="thermal_summary">Выберите Ваш профиль производительности</string>
-    <string name="thermal_dialogTitle">Выберите Ваш профиль производительности</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">Производительность</string>
-    <string name="thermal_battery">Энергосбережение</string>
-    <string name="thermal_gaming">Игры</string>
-    <string name="thermal_balance">Баланс</string>
-    <string name="thermal_extreme_battery">Экстримальное энергосбережение</string>
-
-    <!-- kcal -->
-    <string name="advanced_settings_kcal">Калибрация цвета экрана</string>
-    <string name="cat_colormanagement">Настройки цвета</string>
-    <string name="cat_calibration">Калибрация экрана</string>
-
-    <string name="kcal_enabled">Включено</string>
-    <string name="kcal_disabled">Выключено</string>
-    <string name="set_on_boot">Включать при загрузке</string>
-    <string name="color_red">Красный</string>
-    <string name="color_green">Зелёный</string>
-    <string name="color_blue">Синий</string>
-    <string name="color_minimum">Минимум</string>
-    <string name="saturation">Насыщеность</string>
-    <string name="value">Экспозиция</string>
-    <string name="contrast">Контраст</string>
-    <string name="hue">Оттенок</string>
-    <string name="grayscale">Экран в оттенках серого</string>
-
-    <string name="presets_dialog_title">Выберите пресет</string>
-
-    <!-- menu -->
-    <string name="kcal_reset">Вернуть пресет по умолчанию</string>
-
-    <!-- CustomSeekBarPreference -->
-    <string name="edit_value">Введите новое значение</string>
-    <string name="default_value">Значение по умолчанию</string>
-    <string name="edit_hint">Значение между %1$d и %2$d</string>
-</resources>

XiaomiParts/res/values-zh/strings.xml

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The Mokee 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>
-    <string name="advanced_settings">小米设置</string>
-    <string name="advanced_settings_summary">附加设置</string>
-
-    <string name="display_title">显示</string>
-
-    <!-- KCal -->
-    <string name="device_kcal_title">显示颜色矫正</string>
-
-    <!-- Ambient Display -->
-    <string name="ambient_display_xiaomi">Xiaomi Doze</string>
-    <string name="advanced_doze_summary">环境显示</string>
-
-    <string name="vibration_title">触觉反馈</string>
-    <string name="vibration_strength_title">强度</string>
-
-    <!-- Thermal Profiles -->
-    <string name="thermal_profile_title">性能</string>
-    <string name="thermal_title">性能选项</string>
-    <string name="thermal_summary">性能选项</string>
-    <string name="thermal_dialogTitle">设置性能选项</string>
-
-    <!-- Values for Thermal Presets -->
-    <string name="thermal_performance">高性能</string>
-    <string name="thermal_battery">延长电池</string>
-    <string name="thermal_gaming">游戏</string>
-    <string name="thermal_balance">平衡</string>
-    <string name="thermal_extreme_battery">极致延长电池</string>
-
-    <string name="advanced_settings_kcal">显示颜色矫正</string>
-    <string name="cat_calibration">显示矫正</string>
-    <string name="kcal_enabled">启用</string>
-    <string name="set_on_boot">在启动时设置</string>
-    <string name="kcal_disabled">关闭</string>
-    <string name="color_red">红</string>
-    <string name="color_green">绿</string>
-    <string name="color_blue">蓝</string>
-    <string name="color_minimum">最低</string>
-    <string name="saturation">饱和度</string>
-    <string name="value">设定值</string>
-    <string name="contrast">对比度</string>
-    <string name="hue">色调</string>
-    <string name="cat_colormanagement">颜色设置</string>
-    <string name="kcal_reset">重置</string>
-    <string name="edit_value">设定一个新的值</string>
-
-    <string name="presets_dialog_title">选择预设</string>
-    <!-- Presets -->
-    <string name="preset_default">默认</string>
-    <string name="preset_version_1">版本 1</string>
-    <string name="preset_version_2">版本 2</string>
-    <string name="preset_version_3">版本 3</string>
-    <string name="preset_triluminous">Triluminous</string>
-    <string name="preset_deep_black_white">Deep Black and White</string>
-    <string name="preset_deep_natural">Deep Natural</string>
-    <string name="preset_cool_amoled">Cool Amoled</string>
-    <string name="preset_extreme_amoled">Extreme Amoled</string>
-    <string name="preset_warm_amoled">Warm Amoled</string>
-    <string name="preset_hybrid_mamba">Hybrid Mamba</string>
-</resources>

sdm660.mk

@@ -212,9 +212,9 @@ PRODUCT_PACKAGES += \
     vendor.display.config@1.9 \
     vendor.display.config@1.9_vendor
 
-# Doze
+# DeviceDoze
 PRODUCT_PACKAGES += \
-    XiaomiDoze
+    DeviceDoze
 
 # DRM
 PRODUCT_PACKAGES += \
@@ -599,6 +599,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_BOOT_JARS += \
     WfdCommon
 
-# XiaomiParts
+# DeviceSettings
 PRODUCT_PACKAGES += \
-   XiaomiParts
+   DeviceSettings