Compare commits
23 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c648d018fe | ||
|
|
db0e4181c3 | ||
|
|
05c66c10b7 | ||
|
|
7f3e5ae48a | ||
|
|
e7b1693540 | ||
|
|
b5a5e80aea | ||
|
|
04b6c575a5 | ||
|
|
f82405707b | ||
|
|
82d9c41527 | ||
|
|
6c6a9873a0 | ||
|
|
26d3d5ec81 | ||
|
|
287509be38 | ||
|
|
e777126254 | ||
|
|
374731cfbe | ||
|
|
d3c8ff5823 | ||
|
|
d8395c1abe | ||
|
|
8476df6a93 | ||
|
|
327de60ac2 | ||
|
|
95e5208d68 | ||
|
|
6a110f2c18 | ||
|
|
f0f3eaa93f | ||
|
|
af75404f90 | ||
|
|
7267758e87 |
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -252,7 +252,13 @@
|
||||
<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>
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -54,6 +54,24 @@
|
||||
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"
|
||||
@@ -116,12 +134,21 @@
|
||||
android:summary="@string/pulse_settings_summary"
|
||||
android:fragment="com.cherish.settings.fragments.sound.PulseSettings" />
|
||||
|
||||
<!-- <com.cherish.settings.preferences.SystemSettingSeekBarPreference
|
||||
<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: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>
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user