From fd8b4b59fa3a3f260901723f975116ff48478291 Mon Sep 17 00:00:00 2001
From: Ali B <abittin@gmail.com>
Date: Tue, 4 Jun 2019 13:54:38 +0300
Subject: [PATCH] Cherish:Add keyguard weather style (2/2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DennySPb: use listpreference

Change-Id: I10c965a4a50d5c59f27c5019c3e0f1081734bf52
Signed-off-by: DennySPb <dennyspb@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                 |  9 ++++++++
 res/values/cherish_strings.xml                |  5 +++++
 res/xml/cherish_settings_lockscreen.xml       | 10 +++++++++
 .../fragments/OmniJawsSettings.java           | 22 +++++++++----------
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 684359a..6e37084 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -439,4 +439,13 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+
+    <string-array name="lockscreen_weather_style_entries">
+        <item>@string/lockscreen_weather_omni_style_title</item>
+        <item>@string/lockscreen_weather_pixel_style_title</item>
+    </string-array>
+    <string-array name="lockscreen_weather_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index cb5cbcd..dcc261d 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -537,4 +537,9 @@
     <string name="weather_icon_pack_title">Condition icon pack</string>
     <string name="weather_icon_pack_note">Note\u003a you can install new icon packs from play store by searching for \"Chronus icons\"</string>
     <string name="weather_icon_pack_info_title">Condition icon pack is used in quick settings and lock screen</string>
+
+    <!-- Lockscreen weather style -->
+    <string name="lockscreen_weather_style_title">Weather style</string>
+    <string name="lockscreen_weather_omni_style_title">Omni style</string>
+    <string name="lockscreen_weather_pixel_style_title">Pixel style</string>
 </resources>
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index cfc823c..8a7ac21 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -207,6 +207,16 @@
             android:summary="@string/lockscreen_weather_enabled_summary"
             android:defaultValue="false" />
 
+            <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="lockscreen_weather_style"
+            android:title="@string/lockscreen_weather_style_title"
+            android:dialogTitle="@string/lockscreen_weather_style_title"
+            android:entries="@array/lockscreen_weather_style_entries"
+            android:entryValues="@array/lockscreen_weather_style_values"
+            android:defaultValue="0"
+            android:dependency="lockscreen_weather_enabled"
+            android:summary="%s" />
+
         <Preference
             android:key="omnijaws_settings"
             android:icon="@drawable/ic_weather"
diff --git a/src/com/cherish/settings/preferences/fragments/OmniJawsSettings.java b/src/com/cherish/settings/preferences/fragments/OmniJawsSettings.java
index 57b0f88..2720ec8 100644
--- a/src/com/cherish/settings/preferences/fragments/OmniJawsSettings.java
+++ b/src/com/cherish/settings/preferences/fragments/OmniJawsSettings.java
@@ -39,13 +39,15 @@ import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
 
 import java.util.List;
+import java.util.Arrays;
 import java.util.ArrayList;
 
+@SearchIndexable
 public class OmniJawsSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener, Indexable {
+        Preference.OnPreferenceChangeListener {
     private static final String TAG = "OmniJawsSettings";
     private static final String CATEGORY_WEATHER = "weather_category";
     private static final String WEATHER_ICON_PACK = "weather_icon_pack";
@@ -165,19 +167,15 @@ public class OmniJawsSettings extends SettingsPreferenceFragment implements
         return true;
     }
 
-    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
+
                 @Override
-                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
-                        boolean enabled) {
-                    ArrayList<SearchIndexableResource> result =
-                            new ArrayList<SearchIndexableResource>();
-
-                    SearchIndexableResource sir = new SearchIndexableResource(context);
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.omnijaws_settings;
-                    result.add(sir);
-
-                    return result;
+                    return Arrays.asList(sir);
                 }
 
                 @Override