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

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>