23 Commits
qpr3 ... test1

Author SHA1 Message Date
Pranav Vashi
c648d018fe Cherish: Add pixel style lockscreen weather based OmniJaws
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-19 00:37:48 +07:00
Pranav Vashi
db0e4181c3 Cherish: Enable lockscreen weather options properly
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-19 00:36:50 +07:00
Pranav Vashi
05c66c10b7 Cherish: Make weather location on lockscreen optional [2/2]
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-19 00:30:52 +07:00
Pranav Vashi
7f3e5ae48a Cherish: add enablement settings for OmniJaws keyguard slice provider
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-19 00:29:08 +07:00
Pranav Vashi
e7b1693540 Cherish: Add shortcut to configure Weather settings
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-19 00:10:13 +07:00
Ghosuto
b5a5e80aea Cherish: Add more clock bg chip styles [2/2]
Change-Id: I4a5b19037b78f3353da8e46089781e993c378705
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-11 13:35:52 +07:00
minaripenguin
04b6c575a5 Cherish: Increase QS header images max limit
Change-Id: I6578f196822ac712a6299f6eb56c21652c84aaf3
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-11 13:34:24 +07:00
minaripenguin
f82405707b Cherish: Fade filter for lockscreen media artwork [2/2]
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-05-08 21:16:40 +07:00
minaripenguin
82d9c41527 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-05-01 23:45:55 +07:00
DhRV00T
6c6a9873a0 add RMX3461 maintainer
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-27 19:01:06 +07:00
FrEeRuNnEr4EvEr
26d3d5ec81 add Galaxy S10/ N10 series maintainer
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-27 19:00:46 +07:00
Pranav Vashi
287509be38 Cherish: Add support for parallel space
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-25 16:47:04 +07:00
Hưng Phan
e777126254 Cherish:Cleanup old applock
This reverts commit fc7a0c985e.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-25 02:06:37 +07:00
minaripenguin
374731cfbe Cherish: QS Header Image [2/2]
Signed-off-by: minaripenguin <minaripenguin@users.noreply.github.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-21 22:16:04 +07:00
cjybyjk
d3c8ff5823 Cherish: add SystemPropertySwitchPreference
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-14 18:49:36 +07:00
Ido Ben-Hur
d8395c1abe Cherish: Allow choosing a custom background color seed [2/2]
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-14 16:27:47 +07:00
Ido Ben-Hur
8476df6a93 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-04-14 16:27:46 +07:00
Ido Ben-Hur
327de60ac2 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-04-14 16:27:36 +07:00
minaripenguin
95e5208d68 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-04-14 08:31:02 +07:00
Hưng Phan
6a110f2c18 Cherish:Nuke QS date and Resize QS
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-04-02 09:31:30 +07:00
SuperDroidBond
f0f3eaa93f [SQUASHED] SystemUI: user selectable VoLTE/VoWifi Icons [2/2]
This reverts commit dc7f7b2ee5.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-03-31 17:34:01 +07:00
Pranav Vashi
af75404f90 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-03-31 17:34:01 +07:00
adindotdev
7267758e87 Cherish: Smart Pixels [2/2]
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
2023-03-31 17:34:01 +07:00
10 changed files with 155 additions and 66 deletions

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,6 +727,44 @@
<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>
@@ -759,44 +797,4 @@
<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>

View File

@@ -102,8 +102,6 @@
<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>

View File

@@ -252,8 +252,14 @@
<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>
<string name="volte_icon_off">Off</string>
@@ -881,7 +887,6 @@
<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>
@@ -900,4 +905,24 @@
<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>

View File

@@ -353,15 +353,6 @@
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

View File

@@ -53,6 +53,24 @@
android:title="@string/lockscreen_charging_info_title"
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
@@ -117,11 +135,20 @@
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:defaultValue="10"
android:max="25"
settings:min="1" />
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" />
</PreferenceCategory>

View File

@@ -58,6 +58,26 @@
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"

View File

@@ -81,6 +81,14 @@
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"

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>

View File

@@ -43,6 +43,7 @@ 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;
@@ -65,6 +66,7 @@ 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;
@@ -72,6 +74,8 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
private ListPreference mLockClockStyles;
private OmniJawsClient mWeatherClient;
private Preference mWeather;
private PreferenceCategory mUdfpsCategory;
private Context mContext;
private ListPreference mTorchPowerButton;
@@ -127,11 +131,10 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
prefSet.removePreference(mFingerprintSuccessVib);
prefSet.removePreference(mFingerprintErrorVib);
}
}
@Override
public void onResume() {
super.onResume();
mWeather = (Preference) findPreference(KEY_WEATHER);
mWeatherClient = new OmniJawsClient(getContext());
updateWeatherSettings();
}
public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -158,6 +161,21 @@ 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;

View File

@@ -109,6 +109,10 @@ 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