psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove weather

Browse Source 
Revert "Lockscreen Colors: add back Weather color options [2/2]"

This reverts commit de292e0788.

Revert "Cherish:introduce WeatherView Bg Selection [2/2]"

This reverts commit 7f3e49bcd8.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish:add WeatherView Alignment options [2/2]"

This reverts commit e9f1e46eb2.

Revert "LS Styles: add default values & summary for font preferences"

This reverts commit 60a7b23d9f.

Revert "Cherish:LS Weather Temp & City Fonts [2/2]"

This reverts commit a0bf7cbee1.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish:Add switches for Weather Image as well"

This reverts commit afc4d880b1.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Weather: Add switches to show city/temp on lockscreen [2/2]"

This reverts commit e43f47cf7a.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish:Add keyguard weather style (2/2)"

This reverts commit fd8b4b59fa.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish:add back weather parts [3/3]"

This reverts commit 7287e081fc.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Hưng Phan
2021-01-29 19:31:19 +07:00
committed by Hung Phan
parent 56f93a0377
commit d5bfbf912c
9 changed files with 15 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/drawable/ic_cloud.xml
View File

@@ -1,7 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?android:attr/colorControlNormal" android:pathData="M19 18H6C3.79 18 2 16.21 2 14S3.79 10 6 10H6.71C7.37 7.69 9.5 6 12 6C15.04 6 17.5 8.46 17.5 11.5V12H19C20.66 12 22 13.34 22 15S20.66 18 19 18M19.35 10.03C18.67 6.59 15.64 4 12 4C9.11 4 6.6 5.64 5.35 8.03C2.34 8.36 0 10.9 0 14C0 17.31 2.69 20 6 20H19C21.76 20 24 17.76 24 15C24 12.36 21.95 10.22 19.35 10.03M10 17L6.5 13.5L7.91 12.08L10 14.17L14.59 9.59L16 11" />
</vector>

7
res/drawable/ic_weather.xml
View File

@@ -1,7 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?android:attr/colorControlNormal" android:pathData="M12.74,5.47C15.1,6.5 16.35,9.03 15.92,11.46C17.19,12.56 18,14.19 18,16V16.17C18.31,16.06 18.65,16 19,16A3,3 0 0,1 22,19A3,3 0 0,1 19,22H6A4,4 0 0,1 2,18A4,4 0 0,1 6,14H6.27C5,12.45 4.6,10.24 5.5,8.26C6.72,5.5 9.97,4.24 12.74,5.47M11.93,7.3C10.16,6.5 8.09,7.31 7.31,9.07C6.85,10.09 6.93,11.22 7.41,12.13C8.5,10.83 10.16,10 12,10C12.7,10 13.38,10.12 14,10.34C13.94,9.06 13.18,7.86 11.93,7.3M13.55,3.64C13,3.4 12.45,3.23 11.88,3.12L14.37,1.82L15.27,4.71C14.76,4.29 14.19,3.93 13.55,3.64M6.09,4.44C5.6,4.79 5.17,5.19 4.8,5.63L4.91,2.82L7.87,3.5C7.25,3.71 6.65,4.03 6.09,4.44M18,9.71C17.91,9.12 17.78,8.55 17.59,8L19.97,9.5L17.92,11.73C18.03,11.08 18.05,10.4 18,9.71M3.04,11.3C3.11,11.9 3.24,12.47 3.43,13L1.06,11.5L3.1,9.28C3,9.93 2.97,10.61 3.04,11.3M19,18H16V16A4,4 0 0,0 12,12A4,4 0 0,0 8,16H6A2,2 0 0,0 4,18A2,2 0 0,0 6,20H19A1,1 0 0,0 20,19A1,1 0 0,0 19,18Z" />
</vector>

34
res/values/cherish_arrays.xml
View File

@@ -448,15 +448,6 @@
<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>
<!-- Toast Animation -->
<string-array name="toast_animation_entries">
<item>@string/toast_none_animation</item>
@@ -921,31 +912,6 @@
<item>34</item>
<item>35</item>
</string-array>
<!-- Lockscreen Weather styles -->
<string-array name="lockscreen_weather_bg_entries" translatable="false">
<item>@string/lockscreen_date_selection_default</item>
<item>@string/lockscreen_date_selection_str_box</item>
<item>@string/lockscreen_date_selection_str_round</item>
<item>@string/lockscreen_date_selection_qbeta_style</item>
<item>@string/lockscreen_date_selection_str_accent</item>
<item>@string/lockscreen_date_selection_str_accent_transparent</item>
<item>@string/lockscreen_date_selection_str_gradient</item>
<item>@string/lockscreen_date_selection_str_border_accent</item>
<item>@string/lockscreen_date_selection_str_border_gradient</item>
</string-array>
<string-array name="lockscreen_weather_bg_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
</string-array>
<!-- QS Header data uasge -->
<string-array name="qs_datausage_entries" translatable="false">

37
res/values/cherish_strings.xml
View File

@@ -485,8 +485,6 @@
<string name="lock_item_center">Center Aligned</string>
<string name="lock_item_right">Right Aligned</string>
<string name="lockscreen_item_padding_title">Lockscreen Items Padding</string>
<string name="lockscreen_weather_alignment_title">LS Weather Alignment</string>
<string name="lockscreen_weather_selection_title">WeatherView Background Style</string>
<!-- Data disabled icon -->
<string name="data_disabled_icon_title">Data disabled icon</string>
@@ -513,25 +511,6 @@
<string name="lockscreen_hide_shortcuts_title">Hide Bottom Shortcuts</string>
<string name="lockscreen_hide_shortcuts_summary">Hide Left-Right Shortcuts on secure lock screens</string>
<!-- Lockscreen weather -->
<string name="lockscreen_weather_category">Weather</string>
<string name="lockscreen_weather_enabled_title">Show on lockscreen</string>
<string name="lockscreen_weather_enabled_summary">Show weather information on lockscreen and during doze</string>
<string name="lockscreen_weather_settings_title">Setup weather options</string>
<string name="lockscreen_weather_settings_summary">Setup icon pack and weather service</string>
<string name="weather_config_title">Weather service</string>
<string name="weather_config_summary">System service settings</string>
<string name="header_weather_title">Header view weather</string>
<string name="header_weather_summary">Enable notification panel header weather display</string>
<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>
<!-- AOKP custom system animations -->
<string name="animation_settings_title">Animations</string>
<string name="animation_settings_summary">System Wide Animation Options</string>
@@ -827,22 +806,6 @@
<string name="pixel_navbar_anim_title">Pixel animation</string>
<string name="pixel_navbar_anim_summary">Toggle home button animation</string>
<!-- LockWeather Switches -->
<string name="lockscreen_weather_show_city_title">Show city name</string>
<string name="lockscreen_weather_show_city_summary">Show name of current city on left of image</string>
<string name="lockscreen_weather_show_temp_title">Show temperature</string>
<string name="lockscreen_weather_show_temp_summary">Show current city temperature on right of image</string>
<string name="lockscreen_weather_show_image_title">Show Condition Image</string>
<string name="lockscreen_weather_show_image_summary">Show weather conditions image</string>
<!-- LS Weather Temp & City Fonts -->
<string name="lock_weather_temp_font_title">LS Weather Temp font</string>
<string name="lock_weather_temp_font_summary">Change the default font of the lockscreen weather temp</string>
<string name="lock_weather_temp_font_dialog_title">Select lock weather temp font</string>
<string name="lock_weather_city_font_title">LS Weather City font</string>
<string name="lock_weather_city_font_summary">Change the default font of the lockscreen weather city</string>
<string name="lock_weather_city_dialog_title">Select lock weather city font</string>
<!-- QS Footer Text -->
<string name="qs_footer_text_title">QS footer text</string>
<string name="qs_footer_text_summary">Display text at bottom of QS panel</string>

37
res/xml/cherish_settings_lockscreen.xml
View File

@@ -199,15 +199,6 @@
android:summary="%s"
android:defaultValue="1" />
<com.cherish.settings.preferences.SecureSettingListPreference
android:key="lockscreen_weather_alignment"
android:title="@string/lockscreen_weather_alignment_title"
android:dialogTitle="@string/lockscreen_weather_alignment_title"
android:entries="@array/lockscreen_item_alignment_entries"
android:entryValues="@array/lockscreen_item_alignment_values"
android:summary="%s"
android:defaultValue="1" />
<com.cherish.settings.preferences.SecureSettingListPreference
android:key="lock_ownerinfo_alignment"
android:title="@string/lockscreen_ownerinfo_alignment_title"
@@ -239,34 +230,6 @@
android:title="@string/lockscreen_hide_shortcuts_title"
android:summary="@string/lockscreen_hide_shortcuts_summary"
android:defaultValue="false" />
<PreferenceCategory
android:key="lockscreen_weather"
android:title="@string/lockscreen_weather_category" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_enabled"
android:icon="@drawable/ic_cloud"
android:title="@string/lockscreen_weather_enabled_title"
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"
android:title="@string/lockscreen_weather_settings_title"
android:summary="@string/lockscreen_weather_settings_summary"
android:fragment="com.cherish.settings.fragments.OmniJawsSettings" />
<!-- Lockscreen Visualizer-->
<PreferenceCategory

4
res/xml/lock_colors.xml
View File

@@ -48,7 +48,7 @@
android:key="lockscreen_indication_text_color"
android:title="@string/lockscreen_indication_text_color"
android:defaultValue="0xffffffff" />
<!--
<net.margaritov.preference.colorpicker.ColorPickerPreference
android:key="lockscreen_weather_temp_color"
android:title="@string/lockscreen_weather_temp_color"
@@ -63,7 +63,7 @@
android:key="lockscreen_weather_icon_color"
android:title="@string/lockscreen_weather_icon_color"
android:defaultValue="0xffffffff" />
-->
</PreferenceScreen>

86
res/xml/omnijaws_settings.xml
View File

@@ -1,86 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2017 The OmniROM 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/>.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="omnijaws_settings"
android:title="@string/weather_title">
<PreferenceScreen
android:title="@string/weather_config_title"
android:summary="@string/weather_config_summary" >
<intent android:action="android.intent.action.MAIN"
android:targetPackage="org.omnirom.omnijaws"
android:targetClass="org.omnirom.omnijaws.SettingsActivityService" />
</PreferenceScreen>
<ListPreference
android:key="weather_icon_pack"
android:title="@string/weather_icon_pack_title"
android:persistent="false" />
<Preference
android:icon="@drawable/ic_info_outline_24dp"
android:persistent="false"
android:summary="@string/weather_icon_pack_info_title" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_show_image"
android:title="@string/lockscreen_weather_show_image_title"
android:summary="@string/lockscreen_weather_show_image_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_show_city"
android:title="@string/lockscreen_weather_show_city_title"
android:summary="@string/lockscreen_weather_show_city_summary"
android:defaultValue="true" />
<ListPreference
android:key="lock_weather_city_fonts"
android:title="@string/lock_weather_city_font_title"
android:dialogTitle="@string/lock_weather_city_dialog_title"
android:entries="@array/sb_clock_fonts_entries"
android:entryValues="@array/sb_clock_fonts_values"
android:summary="@string/lock_weather_city_font_summary"
android:dependency="lockscreen_weather_show_city"
android:persistent="false" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_show_temp"
android:title="@string/lockscreen_weather_show_temp_title"
android:summary="@string/lockscreen_weather_show_temp_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SecureSettingListPreference
android:key="lockscreen_weather_selection"
android:title="@string/lockscreen_weather_selection_title"
android:dialogTitle="@string/lockscreen_weather_selection_title"
android:entries="@array/lockscreen_weather_bg_entries"
android:entryValues="@array/lockscreen_weather_bg_values"
android:summary="%s"
android:defaultValue="0" />
<ListPreference
android:key="lock_weather_temp_fonts"
android:title="@string/lock_weather_temp_font_title"
android:dialogTitle="@string/lock_weather_temp_font_dialog_title"
android:entries="@array/sb_clock_fonts_entries"
android:entryValues="@array/sb_clock_fonts_values"
android:summary="@string/lock_weather_temp_font_summary"
android:dependency="lockscreen_weather_show_temp"
android:persistent="false" />
</PreferenceScreen>