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

Compare commits

base: psmattas:test1
Branches Tags
psmattas:tiramisu psmattas:patch-1 psmattas:qpr3 psmattas:test psmattas:test1 psmattas:tiramisu-feb psmattas:tiramisu-te psmattas:dec psmattas:20/11 psmattas:twelve-one psmattas:111 psmattas:z psmattas:twelve psmattas:eleven psmattas:ten
..
compare: psmattas:patch-1
Branches Tags
psmattas:patch-1 psmattas:tiramisu psmattas:qpr3 psmattas:test psmattas:test1 psmattas:tiramisu-feb psmattas:tiramisu-te psmattas:dec psmattas:20/11 psmattas:twelve-one psmattas:111 psmattas:z psmattas:twelve psmattas:eleven psmattas:ten

19 Commits
test1 ... patch-1

Author SHA1 Message Date
Puranjay Savar Mattas
f80907af2d Update cherish_maintainers.xml for New Maintainer of Avicii 
The maintainer name string is updated for OnePlus Nord (Avicii) to PsavarMattas.
 2023-07-04 01:26:04 +05:30
Hưng Phan
afc3274f46 Cherish:Hide lockscreen album lever filter now 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-07-01 23:26:00 +07:00
aswin7469
47d8740bd5 Cherish:MonetSetting: Add monochromatic style 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-26 23:30:26 +07:00
Ido Ben-Hur
e0f2441316 Cherish: Allow choosing a custom background color seed [2/2] 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-24 10:31:54 +07:00
Ido Ben-Hur
c811849ab5 SystemUI: monet: Allow a more granular control over shades [2/2] 
Do that by letting the user control the luminance and chroma factors of accent / background colors
Use Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES as an existing medium to store choices

Also refactor the code here

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-24 10:31:46 +07:00
Ido Ben-Hur
70da7a554e Cherish: Add some native monet settings 
Goal is to let users control monet engine more granularly
Generally all we can set solely by changing Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES
Adds the ability to choose the accent color source, a custom accent color and the theme style
Theme styles are generally available with a preview on ThemePicker but not with custom sources nor color

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-24 10:31:36 +07:00
minaripenguin
50fa51cd17 Cherish: Combined signal icons toggle [2/2] 
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-24 00:40:46 +07:00
SuperDroidBond
c53f9af382 [SQUASHED] SystemUI: user selectable VoLTE/VoWifi Icons [2/2] 
This reverts commit dc7f7b2ee5.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-24 00:40:37 +07:00
Ghosuto
458ef94a1d Cherish: Add more clock bg chip styles [2/2] 
Change-Id: I4a5b19037b78f3353da8e46089781e993c378705
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 16:26:21 +07:00
minaripenguin
0b3a6a1cb0 Cherish: Statusbar clock background chip styles [2/2] 
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 16:26:09 +07:00
adindotdev
dd524f9294 Cherish: Smart Pixels [2/2] 
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 16:25:23 +07:00
Hưng Phan
cac222a0b0 Cherish:Disable customization for QS now 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 11:35:40 +07:00
cjybyjk
44fe9b8f7e Cherish: add SystemPropertySwitchPreference 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:16:47 +07:00
Hưng Phan
02edf931db Cherish:Cleanup old applock 
This reverts commit fc7a0c985e.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:16:39 +07:00
Tkiliay
bc3be39190 Add grus maintainer 2023-06-23 03:15:31 +07:00
DhRV00T
714b2e0abb add RMX3461 maintainer 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:15:31 +07:00
FrEeRuNnEr4EvEr
565d76f073 add Galaxy S10/ N10 series maintainer 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:15:31 +07:00
Hưng Phan
6e068591f5 Cherish:Nuke QS date and Resize QS 
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:15:30 +07:00
Pranav Vashi
db8a7a8f95 Pulse: Implement pulse color based album art [2/2] 
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
 2023-06-23 03:15:30 +07:00
10 changed files with 68 additions and 157 deletions
Expand all files Collapse all files

82
res/values/cherish_arrays.xml
View File

@@ -184,7 +184,7 @@
</string-array>
<!-- QS battery style -->
<string-array name="qs_battery_style_entries" translatable="false">
<!-- <string-array name="qs_battery_style_entries" translatable="false">
<item>@string/qs_use_status_bar_battery_style</item>
<item>@string/status_bar_battery_style_icon_portrait</item>
<item>@string/status_bar_battery_style_icon_rlandscape</item>
@@ -228,7 +228,7 @@
<item>9</item>
<item>4</item>
<item>5</item>
</string-array>
</string-array> -->
<!-- Quick Settings brightness slider -->
<string-array name="qs_show_brightness_slider_entries" translatable="false">
@@ -727,44 +727,6 @@
<item>8</item>
</string-array>
<!-- Monet theme styles -->
<string-array name="theme_style_entries">
<item>@string/theme_style_tonal_spot</item>
<item>@string/theme_style_vibrant</item>
<item>@string/theme_style_expressive</item>
<item>@string/theme_style_spritz</item>
<item>@string/theme_style_rainbow</item>
<item>@string/theme_style_fruit_salad</item>
<item>@string/theme_style_muted</item>
<item>@string/theme_style_content</item>
</string-array>
<string-array name="theme_style_values" translatable="false">
<item>TONAL_SPOT</item>
<item>VIBRANT</item>
<item>EXPRESSIVE</item>
<item>SPRITZ</item>
<item>RAINBOW</item>
<item>FRUIT_SALAD</item>
<item>MUTED</item>
<item>CONTENT</item>
</string-array>
<!-- Monet color sources -->
<string-array name="color_source_entries">
<item>@string/color_source_both</item>
<item>@string/color_source_home</item>
<item>@string/color_source_lock</item>
<item>@string/color_source_preset</item>
</string-array>
<string-array name="color_source_values" translatable="false">
<item>both</item>
<item>home_wallpaper</item>
<item>lock_wallpaper</item>
<item>preset</item>
</string-array>
<!-- Status bar chip styles-->
<string-array name="statusbar_clock_chip_entries" translatable="false">
<item>@string/disabled</item>
@@ -797,4 +759,44 @@
<item>11</item>
<item>12</item>
</string-array>
<!-- Monet theme styles -->
<string-array name="theme_style_entries">
<item>@string/theme_style_tonal_spot</item>
<item>@string/theme_style_vibrant</item>
<item>@string/theme_style_expressive</item>
<item>@string/theme_style_spritz</item>
<item>@string/theme_style_rainbow</item>
<item>@string/theme_style_fruit_salad</item>
<item>@string/theme_style_muted</item>
<item>@string/theme_style_content</item>
<item>@string/theme_style_monochromatic</item>
</string-array>
<string-array name="theme_style_values" translatable="false">
<item>TONAL_SPOT</item>
<item>VIBRANT</item>
<item>EXPRESSIVE</item>
<item>SPRITZ</item>
<item>RAINBOW</item>
<item>FRUIT_SALAD</item>
<item>MUTED</item>
<item>CONTENT</item>
<item>MONOCHROMATIC</item>
</string-array>
<!-- Monet color sources -->
<string-array name="color_source_entries">
<item>@string/color_source_both</item>
<item>@string/color_source_home</item>
<item>@string/color_source_lock</item>
<item>@string/color_source_preset</item>
</string-array>
<string-array name="color_source_values" translatable="false">
<item>both</item>
<item>home_wallpaper</item>
<item>lock_wallpaper</item>
<item>preset</item>
</string-array>
</resources>

4
res/values/cherish_maintainers.xml
View File

@@ -102,6 +102,8 @@
<string name="santoni_maintainer">EvilAnsh</string>
<string name="device_ysl">Xiaomi Redmi S2</string>
<string name="ysl_maintainer">Iris</string>
<string name="device_grus">Xiaomi Mi 9 SE</string>
<string name="grus_maintainer">Toyohama</string>
<!-- Realme Device maintainers -->
<string name="device_RMX3461">Realme 9 SE 5g</string>
@@ -148,7 +150,7 @@
<string name="device_lemonades">Oneplus 9R</string>
<string name="lemonades_maintainer">Viper_1057 or Amsal1</string>
<string name="device_avicii">Oneplus Nord</string>
<string name="avicii_maintainer">Snippetguy</string>
<string name="avicii_maintainer">PSavarMattas</string>
<!-- Lenovo Device maintainers -->
<string name="device_jd2019">Lenovo Z5s</string>

27
res/values/cherish_strings.xml
View File

@@ -252,13 +252,7 @@
<string name="lockscreen_albumart_filter_tint">Accent tinted</string>
<string name="lockscreen_albumart_filter_blur">Blur</string>
<string name="lockscreen_albumart_filter_grayblur">Grayscale and blurred</string>
<!-- Media artwork -->
<string name="artwork_media_background_enable_blur_title">Blur media media notification artwork background</string>
<string name="artwork_media_background_blur_radius_title">Blur amount for media notification artwork</string>
<string name="media_artwork_fade_percent_title">Fade percent for media notification artwork</string>
<string name="lockscreen_albumart_filter_blur_radius_title">Blur amount for lockscreen media artwork</string>
<string name="ls_media_artwork_fade_percent_title">Fade amount for lockscreen media artwork</string>
<!-- Show VoLTE icon on statusbar -->
<string name="volte_icon_style_title">Select VoLTE/HD Icon</string>
@@ -887,6 +881,7 @@
<string name="theme_style_fruit_salad">Fruit Salad</string>
<string name="theme_style_muted">Muted</string>
<string name="theme_style_content">Content</string>
<string name="theme_style_monochromatic">Monochromatic</string>
<string name="color_source_title">Color source</string>
<string name="color_source_both">Both (Default)</string>
<string name="color_source_home">Home wallpaper</string>
@@ -905,24 +900,4 @@
<string name="tint_background_title">Tint Background</string>
<string name="tint_background_summary">Make Luminance and Chroma selection affect background colors as well</string>
<!-- QS Header -->
<string name="qs_header_image_title">QS Header Image</string>
<string name="qs_header_random_image_title">QS Header Random Image</string>
<string name="qs_header_random_image_summary">Enable random QS header image</string>
<!-- Parallel space -->
<string name="laboratory_parallel_space_title">Parallel space</string>
<string name="laboratory_parallel_space_summary">Allow running multiple instances of the same application in parallel</string>
<!-- Weather -->
<string name="weather_settings_title">Weather settings</string>
<string name="weather_settings_summary">Setup icon pack and weather service</string>
<string name="lockscreen_weather_title">Weather condition</string>
<string name="lockscreen_weather_summary">Display current weather condition and temperature</string>
<string name="lockscreen_weather_enabled_info">Requires weather service to be enabled</string>
<string name="lockscreen_weather_location_title">Weather location</string>
<string name="lockscreen_weather_location_summary">Display current weather location</string>
<string name="lockscreen_weather_style_title">Pixel style</string>
<string name="lockscreen_weather_style_summary">Display weather as separate row</string>
</resources>

9
res/xml/cherish_maintainers.xml
View File

@@ -353,6 +353,15 @@
android:data="https://t.me/bruh_its_your_brother" />
</Preference>
<Preference
android:title="@string/grus_maintainer"
android:summary="@string/device_grus"
android:icon="@drawable/ic_devs_phone" >
<intent
android:action="android.intent.action.VIEW"
android:data="https://t.me/Tkiliay" />
</Preference>
</PreferenceCategory>
<PreferenceCategory

39
res/xml/cherish_settings_lockscreen.xml
View File

@@ -54,24 +54,6 @@
android:summary="@string/lockscreen_charging_info_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_enabled"
android:title="@string/lockscreen_weather_title"
android:summary="@string/lockscreen_weather_summary"/>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_location"
android:title="@string/lockscreen_weather_location_title"
android:summary="@string/lockscreen_weather_location_summary"
android:dependency="lockscreen_weather_enabled" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="lockscreen_weather_style"
android:title="@string/lockscreen_weather_style_title"
android:summary="@string/lockscreen_weather_style_summary"
android:dependency="lockscreen_weather_enabled" />
<!-- Udfps options -->
<PreferenceCategory
android:key="udfps_category"
@@ -134,21 +116,12 @@
android:summary="@string/pulse_settings_summary"
android:fragment="com.cherish.settings.fragments.sound.PulseSettings" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="ls_media_filter_blur_radius"
android:title="@string/lockscreen_albumart_filter_blur_radius_title"
android:dependency="lockscreen_media_metadata"
android:defaultValue="125"
android:max="125"
settings:min="2" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="ls_media_artwork_fade_percent"
android:title="@string/ls_media_artwork_fade_percent_title"
android:dependency="lockscreen_media_metadata"
android:defaultValue="30"
android:max="80"
settings:min="1" />
<!-- <com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="ls_media_filter_blur_radius"
android:title="@string/lockscreen_albumart_filter_blur_radius_title"
android:defaultValue="10"
android:max="25"
settings:min="1" /> -->
</PreferenceCategory>

20
res/xml/cherish_settings_misc.xml
View File

@@ -58,26 +58,6 @@
android:summary="@string/use_photos_spoof_summary"
android:defaultValue="true" />
<!-- Weather -->
<Preference
android:title="@string/weather_settings_title"
android:summary="@string/weather_settings_summary">
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="org.omnirom.omnijaws"
android:targetClass="org.omnirom.omnijaws.SettingsActivity" />
</Preference>
<!-- Parallel space -->
<Preference
android:key="parallel_space"
android:title="@string/laboratory_parallel_space_title"
android:summary="@string/laboratory_parallel_space_summary">
<intent
android:targetPackage="ink.kscope.parallelspace"
android:targetClass="ink.kscope.parallelspace.MainActivity" />
</Preference>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="click_partial_screenshot"
android:title="@string/click_partial_screenshot_title"

8
res/xml/cherish_settings_quicksettings.xml
View File

@@ -81,14 +81,6 @@
android:key="qs_layout_category"
android:title="@string/qs_layout_category_title">
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="qs_header_image"
android:title="@string/qs_header_image_title"
android:defaultValue="0"
settings:interval="1"
android:max="74"
android:min="0" />
<Preference
android:key="qs_tile_layout"
android:icon="@drawable/ic_qs_tile"

4
res/xml/statusbar_battery.xml
View File

@@ -46,7 +46,7 @@
</PreferenceCategory>
<!-- QS panel battery customizations -->
<PreferenceCategory
<!-- <PreferenceCategory
android:title="@string/qs_battery_category_title">
<com.cherish.settings.preferences.SystemSettingListPreference
@@ -63,6 +63,6 @@
android:entryValues="@array/status_bar_battery_percent_values"
android:defaultValue="2" />
</PreferenceCategory>
</PreferenceCategory> -->
</PreferenceScreen>

26
src/com/cherish/settings/fragments/LockScreenSettings.java
View File

@@ -43,7 +43,6 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.internal.util.cherish.udfps.UdfpsUtils;
import com.android.internal.util.cherish.CherishUtils;
import com.android.internal.util.cherish.OmniJawsClient;
import com.cherish.settings.preferences.SystemSettingListPreference;
import com.cherish.settings.preferences.CustomSeekBarPreference;
import com.cherish.settings.preferences.SecureSettingListPreference;
@@ -66,7 +65,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
private static final String FINGERPRINT_SUCCESS_VIB = "fingerprint_success_vib";
private static final String FINGERPRINT_ERROR_VIB = "fingerprint_error_vib";
private static final String KEY_WEATHER = "lockscreen_weather_enabled";
private FingerprintManager mFingerprintManager;
private SwitchPreference mFingerprintSuccessVib;
@@ -74,8 +72,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
private ListPreference mLockClockStyles;
private OmniJawsClient mWeatherClient;
private Preference mWeather;
private PreferenceCategory mUdfpsCategory;
private Context mContext;
private ListPreference mTorchPowerButton;
@@ -131,10 +127,11 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
prefSet.removePreference(mFingerprintSuccessVib);
prefSet.removePreference(mFingerprintErrorVib);
}
}
mWeather = (Preference) findPreference(KEY_WEATHER);
mWeatherClient = new OmniJawsClient(getContext());
updateWeatherSettings();
@Override
public void onResume() {
super.onResume();
}
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -161,21 +158,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
return false;
}
private void updateWeatherSettings() {
if (mWeatherClient == null || mWeather == null) return;
boolean weatherEnabled = mWeatherClient.isOmniJawsEnabled();
mWeather.setEnabled(weatherEnabled);
mWeather.setSummary(weatherEnabled ? R.string.lockscreen_weather_summary :
R.string.lockscreen_weather_enabled_info);
}
@Override
public void onResume() {
super.onResume();
updateWeatherSettings();
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CHERISH_SETTINGS;

4
src/com/cherish/settings/fragments/StatusBarBattery.java
View File

@@ -109,10 +109,6 @@ public class StatusBarBattery extends SettingsPreferenceFragment
Settings.System.STATUS_BAR_SHOW_BATTERY_PERCENT, 0, UserHandle.USER_CURRENT);
Settings.System.putIntForUser(resolver,
Settings.System.STATUS_BAR_BATTERY_TEXT_CHARGING, 1, UserHandle.USER_CURRENT);
Settings.System.putIntForUser(resolver,
Settings.System.QS_BATTERY_STYLE, -1, UserHandle.USER_CURRENT);
Settings.System.putIntForUser(resolver,
Settings.System.QS_SHOW_BATTERY_PERCENT, 2, UserHandle.USER_CURRENT);
}
@Override