Cleanup some commits:
Revert "[SQUASHED] Custom Carrier Label & Carrier Label Placement [1/2]" This reverts commit69d6ea5f4a. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish: Explain to the user why LS Blur is disabled" This reverts commit7d79cc9d06. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish: Hide LS blur option if homescreen and LS wallpaper are different" This reverts commit8b8a6de242. Revert "Cherish: Add lockscreen background blur [2/2]" This reverts commitd979103998. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com> Revert "Cherish:Notifications background opacity [2/2]" This reverts commitd05ae2705d. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -689,21 +689,6 @@
|
|||||||
<item>2</item>
|
<item>2</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
<!-- Carrier Label -->
|
|
||||||
<string-array name="carrier_label_entries" translatable="false">
|
|
||||||
<item>@string/show_carrier_disabled</item>
|
|
||||||
<item>@string/show_carrier_keyguard</item>
|
|
||||||
<item>@string/show_carrier_statusbar</item>
|
|
||||||
<item>@string/show_carrier_enabled</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<string-array name="carrier_label_values" translatable="false">
|
|
||||||
<item>0</item>
|
|
||||||
<item>1</item>
|
|
||||||
<item>2</item>
|
|
||||||
<item>3</item>
|
|
||||||
</string-array>
|
|
||||||
|
|
||||||
<!-- Brightness sliders styles -->
|
<!-- Brightness sliders styles -->
|
||||||
<string-array name="brightness_slider_style_selector_entries" translatable="false">
|
<string-array name="brightness_slider_style_selector_entries" translatable="false">
|
||||||
<item>@string/brightness_slider_style_default</item>
|
<item>@string/brightness_slider_style_default</item>
|
||||||
|
|||||||
@@ -779,23 +779,6 @@
|
|||||||
<string name="lockscreen_power_menu_disabled_title">Disable power menu on lock screen</string>
|
<string name="lockscreen_power_menu_disabled_title">Disable power menu on lock screen</string>
|
||||||
<string name="lockscreen_power_menu_disabled_summary">This will only disable the power menu on secure lock screens</string>
|
<string name="lockscreen_power_menu_disabled_summary">This will only disable the power menu on secure lock screens</string>
|
||||||
|
|
||||||
<!-- Custom carrier label and position -->
|
|
||||||
<string name="carrier_label_category_title">CarrierLabel Settings</string>
|
|
||||||
<string name="carrier_label_category_summary">Customize statusbar carrierlabel</string>
|
|
||||||
<string name="carrier_label_settings_title">Carrier Label</string>
|
|
||||||
<string name="carrier_label_settings_summary">Customize the carrier label</string>
|
|
||||||
<string name="custom_carrier_label_title">Custom carrier label</string>
|
|
||||||
<string name="custom_carrier_label_explain">Please enter a new label. Leave blank to revert to stock label.</string>
|
|
||||||
<string name="custom_carrier_label_notset">Custom label currently not set</string>
|
|
||||||
<string name="show_carrier_title">Carrier label</string>
|
|
||||||
<string name="show_carrier_disabled">Disabled</string>
|
|
||||||
<string name="show_carrier_keyguard">Lockscreen only</string>
|
|
||||||
<string name="show_carrier_statusbar">Statusbar only</string>
|
|
||||||
<string name="show_carrier_enabled">Lockscreen & statusbar</string>
|
|
||||||
<string name="status_bar_carrier_color">Carrier label color</string>
|
|
||||||
<string name="status_bar_carrier_size">Carrier label size</string>
|
|
||||||
<string name="status_bar_carrier_font_style_title">Carrier Label Font</string>
|
|
||||||
|
|
||||||
<!-- Brightness Slider style -->
|
<!-- Brightness Slider style -->
|
||||||
<string name="brightness_slider_style_title">Brightness slider style</string>
|
<string name="brightness_slider_style_title">Brightness slider style</string>
|
||||||
<string name="brightness_slider_style_default">Default</string>
|
<string name="brightness_slider_style_default">Default</string>
|
||||||
@@ -826,8 +809,6 @@
|
|||||||
<!-- Quick Settings brightness slider -->
|
<!-- Quick Settings brightness slider -->
|
||||||
<string name="qs_show_brightness_slider_title">Brightness slider</string>
|
<string name="qs_show_brightness_slider_title">Brightness slider</string>
|
||||||
<string name="qs_show_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
|
<string name="qs_show_brightness_slider_summary">Show a brightness slider in the quick settings panel</string>
|
||||||
<string name="qs_show_auto_brightness_title">Autobrightness icon</string>
|
|
||||||
<string name="qs_show_auto_brightness_summary">Show toggle for adaptive brightness near the slider</string>
|
|
||||||
|
|
||||||
<!-- Panel Background style -->
|
<!-- Panel Background style -->
|
||||||
<string name="panel_bg_title">Panel background style</string>
|
<string name="panel_bg_title">Panel background style</string>
|
||||||
@@ -1038,10 +1019,7 @@
|
|||||||
<!-- Volume panel extras -->
|
<!-- Volume panel extras -->
|
||||||
<string name="volume_panel_tint_title">Tint the active volume bar</string>
|
<string name="volume_panel_tint_title">Tint the active volume bar</string>
|
||||||
<string name="volume_panel_tint_summary">Use a color gradient to tint the active volume bar</string>
|
<string name="volume_panel_tint_summary">Use a color gradient to tint the active volume bar</string>
|
||||||
|
|
||||||
<!-- Notification background opacity -->
|
|
||||||
<string name="notification_alpha_title">Notification background opacity</string>
|
|
||||||
|
|
||||||
<!-- Global Actions -->
|
<!-- Global Actions -->
|
||||||
<string name="powermenu_advanced_reboot_title">Advanced reboot</string>
|
<string name="powermenu_advanced_reboot_title">Advanced reboot</string>
|
||||||
<string name="powermenu_advanced_reboot_summary">Enables access to recovery and bootloader</string>
|
<string name="powermenu_advanced_reboot_summary">Enables access to recovery and bootloader</string>
|
||||||
@@ -1254,11 +1232,7 @@
|
|||||||
<string name="alarm_blocker_reload">Reload</string>
|
<string name="alarm_blocker_reload">Reload</string>
|
||||||
<string name="alarm_blocker_warning_title">Proceed with caution</string>
|
<string name="alarm_blocker_warning_title">Proceed with caution</string>
|
||||||
<string name="alarm_blocker_warning">Blocking alarms have the potential to cause instability, crashes or data loss.</string>
|
<string name="alarm_blocker_warning">Blocking alarms have the potential to cause instability, crashes or data loss.</string>
|
||||||
|
|
||||||
<!-- Lockscreen blur -->
|
|
||||||
<string name="lockscreen_blur_title">Background blur</string>
|
|
||||||
<string name="lockscreen_blur_disabled">Lock screen Blur cannot be enabled because your current lock screen wallpaper does not match your home screen one, or your device does not support Blur at all.</string>
|
|
||||||
|
|
||||||
<!-- StatusBar weather settings -->
|
<!-- StatusBar weather settings -->
|
||||||
<string name="statusbar_weather_title">Status bar weather</string>
|
<string name="statusbar_weather_title">Status bar weather</string>
|
||||||
<string name="statusbar_weather_summary">Configure from QS settings/Weather.</string>
|
<string name="statusbar_weather_summary">Configure from QS settings/Weather.</string>
|
||||||
|
|||||||
@@ -73,15 +73,6 @@
|
|||||||
android:icon="@drawable/ic_upset"
|
android:icon="@drawable/ic_upset"
|
||||||
android:title="@string/always_on_display_schedule_title"
|
android:title="@string/always_on_display_schedule_title"
|
||||||
android:fragment="com.cherish.settings.fragments.AODSchedule" />
|
android:fragment="com.cherish.settings.fragments.AODSchedule" />
|
||||||
|
|
||||||
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
|
|
||||||
android:key="lockscreen_blur"
|
|
||||||
android:title="@string/lockscreen_blur_title"
|
|
||||||
android:max="100"
|
|
||||||
settings:min="0"
|
|
||||||
settings:units="%"
|
|
||||||
settings:interval="5"
|
|
||||||
android:defaultValue="0" />
|
|
||||||
|
|
||||||
<!-- Lock screen -->
|
<!-- Lock screen -->
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
|
|||||||
@@ -57,17 +57,6 @@
|
|||||||
android:summary="@string/less_boring_heads_up_summary"
|
android:summary="@string/less_boring_heads_up_summary"
|
||||||
android:defaultValue="false" />
|
android:defaultValue="false" />
|
||||||
|
|
||||||
<!-- Notification background opacity -->
|
|
||||||
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
|
|
||||||
android:key="notification_bg_alpha"
|
|
||||||
android:title="@string/notification_alpha_title"
|
|
||||||
android:icon="@drawable/ic_blur"
|
|
||||||
android:defaultValue="255"
|
|
||||||
android:max="255"
|
|
||||||
settings:min="0"
|
|
||||||
settings:units="" />
|
|
||||||
|
|
||||||
|
|
||||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||||
android:key="center_notification_headers"
|
android:key="center_notification_headers"
|
||||||
android:icon="@drawable/ic_notification_center"
|
android:icon="@drawable/ic_notification_center"
|
||||||
|
|||||||
@@ -80,13 +80,6 @@
|
|||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:title="@string/qs_show_brightness_slider_title">
|
android:title="@string/qs_show_brightness_slider_title">
|
||||||
|
|
||||||
<com.cherish.settings.preferences.SecureSettingSwitchPreference
|
|
||||||
android:key="qs_show_auto_brightness"
|
|
||||||
android:icon="@drawable/ic_brightness"
|
|
||||||
android:title="@string/qs_show_auto_brightness_title"
|
|
||||||
android:summary="@string/qs_show_auto_brightness_summary"
|
|
||||||
android:defaultValue="true" />
|
|
||||||
|
|
||||||
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
<com.cherish.settings.preferences.SystemSettingSwitchPreference
|
||||||
android:key="status_bar_brightness_control"
|
android:key="status_bar_brightness_control"
|
||||||
android:icon="@drawable/ic_brightness"
|
android:icon="@drawable/ic_brightness"
|
||||||
|
|||||||
@@ -113,13 +113,6 @@
|
|||||||
android:icon="@drawable/ic_battery_bar"
|
android:icon="@drawable/ic_battery_bar"
|
||||||
android:summary="@string/battery_bar_summary"
|
android:summary="@string/battery_bar_summary"
|
||||||
android:fragment="com.cherish.settings.fragments.BatteryBarSettings" />
|
android:fragment="com.cherish.settings.fragments.BatteryBarSettings" />
|
||||||
|
|
||||||
<Preference
|
|
||||||
android:key="carrier_label"
|
|
||||||
android:icon="@drawable/ic_carrierlabel"
|
|
||||||
android:title="@string/carrier_label_settings_title"
|
|
||||||
android:summary="@string/carrier_label_settings_summary"
|
|
||||||
android:fragment="com.cherish.settings.fragments.CustomCarrierLabel" />
|
|
||||||
|
|
||||||
<Preference
|
<Preference
|
||||||
android:key="cutout_settings"
|
android:key="cutout_settings"
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!--
|
|
||||||
Copyright (C) 2020 CherishOS
|
|
||||||
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.
|
|
||||||
-->
|
|
||||||
<PreferenceScreen
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:title="@string/carrier_label_settings_title"
|
|
||||||
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
|
|
||||||
|
|
||||||
<com.cherish.settings.preferences.SystemSettingListPreference
|
|
||||||
android:key="status_bar_show_carrier"
|
|
||||||
android:title="@string/show_carrier_title"
|
|
||||||
android:dialogTitle="@string/show_carrier_title"
|
|
||||||
android:entries="@array/carrier_label_entries"
|
|
||||||
android:entryValues="@array/carrier_label_values"
|
|
||||||
android:summary="%s"
|
|
||||||
android:defaultValue="0" />
|
|
||||||
|
|
||||||
<PreferenceScreen
|
|
||||||
android:key="custom_carrier_label"
|
|
||||||
android:title="@string/custom_carrier_label_title" />
|
|
||||||
|
|
||||||
<net.margaritov.preference.colorpicker.ColorPickerPreference
|
|
||||||
android:key="status_bar_carrier_color"
|
|
||||||
android:title="@string/status_bar_carrier_color"
|
|
||||||
android:defaultValue="0xffffffff" />
|
|
||||||
|
|
||||||
<com.cherish.settings.preferences.CustomSeekBarPreference
|
|
||||||
android:key="status_bar_carrier_font_size"
|
|
||||||
android:title="@string/status_bar_carrier_size"
|
|
||||||
android:max="23"
|
|
||||||
settings:min="8"
|
|
||||||
settings:defaultValue="14"
|
|
||||||
settings:units="dp" />
|
|
||||||
|
|
||||||
</PreferenceScreen>
|
|
||||||
@@ -1,188 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2020 CherishOS
|
|
||||||
*
|
|
||||||
* 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 android.app.AlertDialog;
|
|
||||||
import android.content.ContentResolver;
|
|
||||||
import android.content.Context;
|
|
||||||
import android.content.DialogInterface;
|
|
||||||
import android.content.DialogInterface.OnCancelListener;
|
|
||||||
import android.content.Intent;
|
|
||||||
import android.content.res.Resources;
|
|
||||||
import android.os.Bundle;
|
|
||||||
import android.os.UserHandle;
|
|
||||||
import android.provider.Settings;
|
|
||||||
import android.text.Spannable;
|
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import androidx.preference.Preference;
|
|
||||||
import androidx.preference.PreferenceScreen;
|
|
||||||
import androidx.preference.ListPreference;
|
|
||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
|
||||||
import com.cherish.settings.preferences.CustomSeekBarPreference;
|
|
||||||
import net.margaritov.preference.colorpicker.ColorPickerPreference;
|
|
||||||
|
|
||||||
import com.android.settings.R;
|
|
||||||
import com.android.settings.SettingsPreferenceFragment;
|
|
||||||
|
|
||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
|
||||||
import android.provider.SearchIndexableResource;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
|
|
||||||
public class CustomCarrierLabel extends SettingsPreferenceFragment
|
|
||||||
implements Preference.OnPreferenceChangeListener {
|
|
||||||
|
|
||||||
public static final String TAG = "CarrierLabel";
|
|
||||||
private static final String CUSTOM_CARRIER_LABEL = "custom_carrier_label";
|
|
||||||
private static final String STATUS_BAR_CARRIER_COLOR = "status_bar_carrier_color";
|
|
||||||
private static final String STATUS_BAR_CARRIER_FONT_SIZE = "status_bar_carrier_font_size";
|
|
||||||
|
|
||||||
static final int DEFAULT_STATUS_CARRIER_COLOR = 0xffffffff;
|
|
||||||
|
|
||||||
private PreferenceScreen mCustomCarrierLabel;
|
|
||||||
private String mCustomCarrierLabelText;
|
|
||||||
private ColorPickerPreference mCarrierColorPicker;
|
|
||||||
private CustomSeekBarPreference mStatusBarCarrierSize;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle icicle) {
|
|
||||||
super.onCreate(icicle);
|
|
||||||
addPreferencesFromResource(R.xml.custom_carrier_label);
|
|
||||||
PreferenceScreen prefSet = getPreferenceScreen();
|
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
|
||||||
|
|
||||||
int intColor;
|
|
||||||
String hexColor;
|
|
||||||
|
|
||||||
// custom carrier label
|
|
||||||
mCustomCarrierLabel = (PreferenceScreen) findPreference(CUSTOM_CARRIER_LABEL);
|
|
||||||
updateCustomLabelTextSummary();
|
|
||||||
|
|
||||||
mCarrierColorPicker = (ColorPickerPreference) findPreference(STATUS_BAR_CARRIER_COLOR);
|
|
||||||
mCarrierColorPicker.setOnPreferenceChangeListener(this);
|
|
||||||
intColor = Settings.System.getInt(resolver,
|
|
||||||
Settings.System.STATUS_BAR_CARRIER_COLOR, DEFAULT_STATUS_CARRIER_COLOR);
|
|
||||||
hexColor = String.format("#%08x", (0xffffffff & intColor));
|
|
||||||
mCarrierColorPicker.setSummary(hexColor);
|
|
||||||
mCarrierColorPicker.setNewPreviewColor(intColor);
|
|
||||||
|
|
||||||
mStatusBarCarrierSize = (CustomSeekBarPreference) findPreference(STATUS_BAR_CARRIER_FONT_SIZE);
|
|
||||||
int StatusBarCarrierSize = Settings.System.getInt(resolver,
|
|
||||||
Settings.System.STATUS_BAR_CARRIER_FONT_SIZE, 14);
|
|
||||||
mStatusBarCarrierSize.setValue(StatusBarCarrierSize / 1);
|
|
||||||
mStatusBarCarrierSize.setOnPreferenceChangeListener(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int getMetricsCategory() {
|
|
||||||
return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onResume() {
|
|
||||||
super.onResume();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
|
||||||
|
|
||||||
if (preference == mCarrierColorPicker) {
|
|
||||||
String hex = ColorPickerPreference.convertToARGB(
|
|
||||||
Integer.valueOf(String.valueOf(newValue)));
|
|
||||||
preference.setSummary(hex);
|
|
||||||
int intHex = ColorPickerPreference.convertToColorInt(hex);
|
|
||||||
Settings.System.putInt(resolver,
|
|
||||||
Settings.System.STATUS_BAR_CARRIER_COLOR, intHex);
|
|
||||||
return true;
|
|
||||||
} else if (preference == mStatusBarCarrierSize) {
|
|
||||||
int width = ((Integer)newValue).intValue();
|
|
||||||
Settings.System.putInt(resolver,
|
|
||||||
Settings.System.STATUS_BAR_CARRIER_FONT_SIZE, width);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean onPreferenceTreeClick(Preference preference) {
|
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
|
||||||
boolean value;
|
|
||||||
if (preference.getKey().equals(CUSTOM_CARRIER_LABEL)) {
|
|
||||||
AlertDialog.Builder alert = new AlertDialog.Builder(getActivity());
|
|
||||||
alert.setTitle(R.string.custom_carrier_label_title);
|
|
||||||
alert.setMessage(R.string.custom_carrier_label_explain);
|
|
||||||
// Set an EditText view to get user input
|
|
||||||
final EditText input = new EditText(getActivity());
|
|
||||||
input.setText(TextUtils.isEmpty(mCustomCarrierLabelText) ? "" : mCustomCarrierLabelText);
|
|
||||||
input.setSelection(input.getText().length());
|
|
||||||
alert.setView(input);
|
|
||||||
alert.setPositiveButton(getString(android.R.string.ok),
|
|
||||||
new DialogInterface.OnClickListener() {
|
|
||||||
public void onClick(DialogInterface dialog, int whichButton) {
|
|
||||||
String value = ((Spannable) input.getText()).toString().trim();
|
|
||||||
Settings.System.putString(resolver, Settings.System.CUSTOM_CARRIER_LABEL, value);
|
|
||||||
updateCustomLabelTextSummary();
|
|
||||||
Intent i = new Intent();
|
|
||||||
i.setAction(Intent.ACTION_CUSTOM_CARRIER_LABEL_CHANGED);
|
|
||||||
getActivity().sendBroadcast(i);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
alert.setNegativeButton(getString(android.R.string.cancel), null);
|
|
||||||
alert.show();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateCustomLabelTextSummary() {
|
|
||||||
mCustomCarrierLabelText = Settings.System.getString(
|
|
||||||
getContentResolver(), Settings.System.CUSTOM_CARRIER_LABEL);
|
|
||||||
if (TextUtils.isEmpty(mCustomCarrierLabelText)) {
|
|
||||||
mCustomCarrierLabel.setSummary(R.string.custom_carrier_label_notset);
|
|
||||||
} else {
|
|
||||||
mCustomCarrierLabel.setSummary(mCustomCarrierLabelText);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* For Search.
|
|
||||||
*/
|
|
||||||
|
|
||||||
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
|
||||||
new BaseSearchIndexProvider() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
|
|
||||||
boolean enabled) {
|
|
||||||
ArrayList<SearchIndexableResource> result =
|
|
||||||
new ArrayList<SearchIndexableResource>();
|
|
||||||
SearchIndexableResource sir = new SearchIndexableResource(context);
|
|
||||||
sir.xmlResId = R.xml.custom_carrier_label;
|
|
||||||
result.add(sir);
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<String> getNonIndexableKeys(Context context) {
|
|
||||||
List<String> keys = super.getNonIndexableKeys(context);
|
|
||||||
return keys;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -28,7 +28,6 @@ import android.content.res.Resources;
|
|||||||
import android.hardware.fingerprint.FingerprintManager;
|
import android.hardware.fingerprint.FingerprintManager;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.ParcelFileDescriptor;
|
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
import androidx.preference.SwitchPreference;
|
import androidx.preference.SwitchPreference;
|
||||||
import androidx.preference.ListPreference;
|
import androidx.preference.ListPreference;
|
||||||
@@ -41,8 +40,6 @@ import com.android.settings.R;
|
|||||||
import com.android.settings.SettingsPreferenceFragment;
|
import com.android.settings.SettingsPreferenceFragment;
|
||||||
import com.android.internal.util.cherish.FodUtils;
|
import com.android.internal.util.cherish.FodUtils;
|
||||||
import com.android.internal.util.cherish.CherishUtils;
|
import com.android.internal.util.cherish.CherishUtils;
|
||||||
import com.cherish.settings.preferences.SystemSettingSeekBarPreference;
|
|
||||||
import com.cherish.settings.utils.Utils;
|
|
||||||
import com.cherish.settings.preferences.SystemSettingListPreference;
|
import com.cherish.settings.preferences.SystemSettingListPreference;
|
||||||
import com.cherish.settings.preferences.CustomSeekBarPreference;
|
import com.cherish.settings.preferences.CustomSeekBarPreference;
|
||||||
import com.cherish.settings.preferences.SecureSettingListPreference;
|
import com.cherish.settings.preferences.SecureSettingListPreference;
|
||||||
@@ -67,8 +64,6 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
|||||||
private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
|
private static final String AOD_SCHEDULE_KEY = "always_on_display_schedule";
|
||||||
private static final String FOD_ANIMATION_CATEGORY = "fod_animations";
|
private static final String FOD_ANIMATION_CATEGORY = "fod_animations";
|
||||||
private static final String FOD_ICON_PICKER_CATEGORY = "fod_icon_picker";
|
private static final String FOD_ICON_PICKER_CATEGORY = "fod_icon_picker";
|
||||||
private static final String KEY_LOCKSCREEN_BLUR = "lockscreen_blur";
|
|
||||||
|
|
||||||
private ContentResolver mResolver;
|
private ContentResolver mResolver;
|
||||||
private Preference FODSettings;
|
private Preference FODSettings;
|
||||||
|
|
||||||
@@ -78,11 +73,10 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
|||||||
static final int MODE_MIXED_SUNSET = 3;
|
static final int MODE_MIXED_SUNSET = 3;
|
||||||
static final int MODE_MIXED_SUNRISE = 4;
|
static final int MODE_MIXED_SUNRISE = 4;
|
||||||
|
|
||||||
private SystemSettingSeekBarPreference mLockscreenBlur;
|
|
||||||
private CustomSeekBarPreference mClockFontSize;
|
private CustomSeekBarPreference mClockFontSize;
|
||||||
private CustomSeekBarPreference mDateFontSize;
|
private CustomSeekBarPreference mDateFontSize;
|
||||||
private CustomSeekBarPreference mOwnerInfoFontSize;
|
private CustomSeekBarPreference mOwnerInfoFontSize;
|
||||||
private CustomSeekBarPreference mCustomTextClockFontSize;
|
private CustomSeekBarPreference mCustomTextClockFontSize;
|
||||||
private PreferenceCategory mFODIconPickerCategory;
|
private PreferenceCategory mFODIconPickerCategory;
|
||||||
private Preference mAODPref;
|
private Preference mAODPref;
|
||||||
|
|
||||||
@@ -90,18 +84,10 @@ public class LockScreenSettings extends SettingsPreferenceFragment implements
|
|||||||
public void onCreate(Bundle icicle) {
|
public void onCreate(Bundle icicle) {
|
||||||
super.onCreate(icicle);
|
super.onCreate(icicle);
|
||||||
addPreferencesFromResource(R.xml.cherish_settings_lockscreen);
|
addPreferencesFromResource(R.xml.cherish_settings_lockscreen);
|
||||||
Context mContext = getContext();
|
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
PreferenceScreen prefScreen = getPreferenceScreen();
|
PreferenceScreen prefScreen = getPreferenceScreen();
|
||||||
Resources resources = getResources();
|
Resources resources = getResources();
|
||||||
WallpaperManager manager = WallpaperManager.getInstance(mContext);
|
|
||||||
|
|
||||||
ParcelFileDescriptor pfd = manager.getWallpaperFile(WallpaperManager.FLAG_LOCK);
|
|
||||||
mLockscreenBlur = (SystemSettingSeekBarPreference) findPreference(KEY_LOCKSCREEN_BLUR);
|
|
||||||
if (!Utils.isBlurSupported() || pfd != null) {
|
|
||||||
mLockscreenBlur.setEnabled(false);
|
|
||||||
mLockscreenBlur.setSummary(getString(R.string.lockscreen_blur_disabled));
|
|
||||||
}
|
|
||||||
|
|
||||||
mFODIconPickerCategory = findPreference(FOD_ICON_PICKER_CATEGORY);
|
mFODIconPickerCategory = findPreference(FOD_ICON_PICKER_CATEGORY);
|
||||||
if (mFODIconPickerCategory != null && !FodUtils.hasFodSupport(getContext())) {
|
if (mFODIconPickerCategory != null && !FodUtils.hasFodSupport(getContext())) {
|
||||||
|
|||||||
@@ -19,23 +19,13 @@ package com.cherish.settings.utils;
|
|||||||
|
|
||||||
import static android.os.UserHandle.USER_SYSTEM;
|
import static android.os.UserHandle.USER_SYSTEM;
|
||||||
|
|
||||||
import android.app.Activity;
|
|
||||||
import android.app.ActivityManager;
|
|
||||||
import android.content.ContentResolver;
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.pm.ActivityInfo;
|
|
||||||
import android.content.om.IOverlayManager;
|
import android.content.om.IOverlayManager;
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
import android.os.Build;
|
|
||||||
import android.os.SystemProperties;
|
|
||||||
import android.provider.Settings;
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import android.text.TextUtils;
|
|
||||||
import android.view.KeyCharacterMap;
|
|
||||||
import android.view.KeyEvent;
|
|
||||||
import android.view.Surface;
|
|
||||||
|
|
||||||
public class Utils {
|
public class Utils {
|
||||||
|
|
||||||
@@ -46,13 +36,5 @@ public class Utils {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isBlurSupported() {
|
|
||||||
boolean blurSupportedSysProp = SystemProperties
|
|
||||||
.getBoolean("ro.surface_flinger.supports_background_blur", false);
|
|
||||||
boolean blurDisabledSysProp = SystemProperties
|
|
||||||
.getBoolean("persist.sys.sf.disable_blurs", false);
|
|
||||||
return blurSupportedSysProp && !blurDisabledSysProp && ActivityManager.isHighEndGfx();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user