Cherish: Bring back Monet settings
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -713,7 +713,7 @@
|
|||||||
<!-- Quick QS Panel brightness slider -->
|
<!-- Quick QS Panel brightness slider -->
|
||||||
<string name="quick_qs_brightness_slider_title">Show brightness slider in Quick QS Panel</string>
|
<string name="quick_qs_brightness_slider_title">Show brightness slider in Quick QS Panel</string>
|
||||||
<string name="quick_qs_brightness_slider_summary">Show a brightness slider in the quick qs panel</string>
|
<string name="quick_qs_brightness_slider_summary">Show a brightness slider in the quick qs panel</string>
|
||||||
|
|
||||||
<!-- Volume rocker gestures -->
|
<!-- Volume rocker gestures -->
|
||||||
<string name="volume_skiptrack_screen_title">Skip music tracks</string>
|
<string name="volume_skiptrack_screen_title">Skip music tracks</string>
|
||||||
|
|
||||||
@@ -755,6 +755,18 @@
|
|||||||
<string name="qs_brightness_slider_position_top">Top</string>
|
<string name="qs_brightness_slider_position_top">Top</string>
|
||||||
<string name="qs_brightness_slider_position_bottom">Bottom</string>
|
<string name="qs_brightness_slider_position_bottom">Bottom</string>
|
||||||
|
|
||||||
|
<!-- Monet Engine -->
|
||||||
|
<string name="monet_category">Monet</string>
|
||||||
|
<string name="monet_engine_title">Monet engine</string>
|
||||||
|
<string name="monet_engine_summary">Customize monet parameters</string>
|
||||||
|
<string name="monet_engine_custom_color_title">Use custom color</string>
|
||||||
|
<string name="monet_engine_custom_color_summary">Use custom color for monet engine instead of wallpaper colors</string>
|
||||||
|
<string name="monet_engine_color_override_title">Custom color</string>
|
||||||
|
<string name="monet_engine_white_luminance_user_title">White luminance</string>
|
||||||
|
<string name="monet_engine_accurate_shades_title">Use accurate shades</string>
|
||||||
|
<string name="monet_engine_chroma_factor_title">Chroma factor</string>
|
||||||
|
<string name="monet_engine_linear_lightness_title">Use linear lightness</string>
|
||||||
|
|
||||||
<!-- Quick Settings brightness icon -->
|
<!-- Quick Settings brightness icon -->
|
||||||
<string name="qs_show_auto_brightness_title">Auto brightness icon</string>
|
<string name="qs_show_auto_brightness_title">Auto brightness icon</string>
|
||||||
<string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
|
<string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
|
||||||
|
|||||||
48
res/xml/cherish_settings_monet.xml
Normal file
48
res/xml/cherish_settings_monet.xml
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
Copyright (C) 2020-22 The CherishOS Project
|
||||||
|
SPDX-License-Identifier: Apache-2.0
|
||||||
|
-->
|
||||||
|
<PreferenceScreen
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
|
||||||
|
android:title="@string/monet_engine_title">
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SecureSettingSwitchPreference
|
||||||
|
android:key="monet_engine_custom_color"
|
||||||
|
android:title="@string/monet_engine_custom_color_title"
|
||||||
|
android:summary="@string/monet_engine_custom_color_summary"
|
||||||
|
android:defaultValue="false" />
|
||||||
|
|
||||||
|
<net.margaritov.preference.colorpicker.ColorPickerPreference
|
||||||
|
android:key="monet_engine_color_override"
|
||||||
|
android:title="@string/monet_engine_color_override_title"
|
||||||
|
android:dependency="monet_engine_custom_color"
|
||||||
|
android:defaultValue="0xffffff" />
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SecureSettingSeekBarPreference
|
||||||
|
android:key="monet_engine_white_luminance_user"
|
||||||
|
android:title="@string/monet_engine_white_luminance_user_title"
|
||||||
|
android:defaultValue="425"
|
||||||
|
android:max="1000"
|
||||||
|
settings:min="200"
|
||||||
|
settings:interval="25"/>
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SecureSettingSwitchPreference
|
||||||
|
android:key="monet_engine_accurate_shades"
|
||||||
|
android:title="@string/monet_engine_accurate_shades_title"
|
||||||
|
android:defaultValue="true" />
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SecureSettingSeekBarPreference
|
||||||
|
android:key="monet_engine_chroma_factor"
|
||||||
|
android:title="@string/monet_engine_chroma_factor_title"
|
||||||
|
android:defaultValue="100"
|
||||||
|
android:max="400"
|
||||||
|
settings:min="50"
|
||||||
|
settings:interval="25"/>
|
||||||
|
|
||||||
|
<com.cherish.settings.preferences.SecureSettingSwitchPreference
|
||||||
|
android:key="monet_engine_linear_lightness"
|
||||||
|
android:title="@string/monet_engine_linear_lightness_title"
|
||||||
|
android:defaultValue="false" />
|
||||||
|
</PreferenceScreen>
|
||||||
@@ -79,8 +79,8 @@
|
|||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="quick_settings_brighness_category"
|
android:key="quick_settings_brighness_category"
|
||||||
android:title="@string/qs_brightness_slider_category">
|
android:title="@string/qs_brightness_slider_category">
|
||||||
|
|
||||||
<!-- Brightness slider -->
|
<!-- Brightness slider -->
|
||||||
<com.cherish.settings.preferences.SecureSettingListPreference
|
<com.cherish.settings.preferences.SecureSettingListPreference
|
||||||
android:key="qs_show_brightness_slider"
|
android:key="qs_show_brightness_slider"
|
||||||
android:title="@string/qs_show_brightness_slider_title"
|
android:title="@string/qs_show_brightness_slider_title"
|
||||||
|
|||||||
@@ -34,6 +34,12 @@
|
|||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:title="@string/theme_customization_category">
|
android:title="@string/theme_customization_category">
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="monet_engine"
|
||||||
|
android:title="@string/monet_engine_title"
|
||||||
|
android:summary="@string/monet_engine_summary"
|
||||||
|
android:fragment="com.cherish.settings.fragments.MonetEngine" />
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="dark_ui_mode"
|
android:key="dark_ui_mode"
|
||||||
|
|||||||
123
src/com/cherish/settings/fragments/ui/MonetEngine.java
Normal file
123
src/com/cherish/settings/fragments/ui/MonetEngine.java
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2020-2022 The CherishOS Project
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package com.cherish.settings.fragments;
|
||||||
|
|
||||||
|
import static android.os.UserHandle.USER_SYSTEM;
|
||||||
|
|
||||||
|
import android.app.ActivityManagerNative;
|
||||||
|
import android.app.UiModeManager;
|
||||||
|
import android.content.ContentResolver;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.om.IOverlayManager;
|
||||||
|
import android.content.om.OverlayInfo;
|
||||||
|
import android.content.pm.PackageManager.NameNotFoundException;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.content.res.Resources;
|
||||||
|
import android.graphics.Color;
|
||||||
|
import android.os.AsyncTask;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.RemoteException;
|
||||||
|
import android.os.ServiceManager;
|
||||||
|
import android.os.UserHandle;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.text.TextUtils;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.IWindowManager;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.WindowManagerGlobal;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.VisibleForTesting;
|
||||||
|
import androidx.preference.ListPreference;
|
||||||
|
import androidx.preference.Preference.OnPreferenceChangeListener;
|
||||||
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceCategory;
|
||||||
|
import androidx.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||||
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.SettingsPreferenceFragment;
|
||||||
|
import com.android.settings.Utils;
|
||||||
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
|
import net.margaritov.preference.colorpicker.ColorPickerPreference;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Comparator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
||||||
|
public class MonetEngine extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
|
||||||
|
|
||||||
|
private String MONET_ENGINE_COLOR_OVERRIDE = "monet_engine_color_override";
|
||||||
|
|
||||||
|
private ColorPickerPreference mMonetColor;
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
addPreferencesFromResource(R.xml.cherish_settings_monet);
|
||||||
|
|
||||||
|
mContext = getActivity();
|
||||||
|
|
||||||
|
final ContentResolver resolver = getActivity().getContentResolver();
|
||||||
|
final PreferenceScreen screen = getPreferenceScreen();
|
||||||
|
|
||||||
|
mMonetColor = (ColorPickerPreference) screen.findPreference(MONET_ENGINE_COLOR_OVERRIDE);
|
||||||
|
int intColor = Settings.Secure.getInt(resolver, MONET_ENGINE_COLOR_OVERRIDE, Color.WHITE);
|
||||||
|
String hexColor = String.format("#%08x", (0xffffff & intColor));
|
||||||
|
mMonetColor.setNewPreviewColor(intColor);
|
||||||
|
mMonetColor.setSummary(hexColor);
|
||||||
|
mMonetColor.setOnPreferenceChangeListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getMetricsCategory() {
|
||||||
|
return MetricsEvent.CHERISH_SETTINGS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
||||||
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
|
if (preference == mMonetColor) {
|
||||||
|
String hex = ColorPickerPreference.convertToARGB(Integer
|
||||||
|
.parseInt(String.valueOf(newValue)));
|
||||||
|
preference.setSummary(hex);
|
||||||
|
int intHex = ColorPickerPreference.convertToColorInt(hex);
|
||||||
|
Settings.Secure.putInt(resolver,
|
||||||
|
MONET_ENGINE_COLOR_OVERRIDE, intHex);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* For Search.
|
||||||
|
*/
|
||||||
|
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||||
|
new BaseSearchIndexProvider(R.xml.cherish_settings_monet);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user