diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml index 3d75569..027abf7 100644 --- a/res/values/cherish_strings.xml +++ b/res/values/cherish_strings.xml @@ -658,5 +658,14 @@ Power/reboot menu opacity Power/reboot dialog dim background amount - + + + Smart Charging + Set maximum charging level + Enable Smart Charging + Stop trigger level + Start trigger level + Reset battery statistics + Reset battery statistics after reaching user defined charging level + Smart Charging allows you to set maximum charging level to extend the lifespan of your battery. When enabled, battery stops charging at Stop trigger level and resumes charging at Start trigger level. Stop trigger level should be always greater than Start trigger level. diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml index 31981dd..7fef609 100644 --- a/res/xml/cherish_settings_misc.xml +++ b/res/xml/cherish_settings_misc.xml @@ -31,6 +31,13 @@ android:summary="@string/laboratory_ignore_window_secure_summary" android:defaultValue="false"/> + + + + + + + + + + + + + + + + diff --git a/src/com/cherish/settings/fragments/MiscSettings.java b/src/com/cherish/settings/fragments/MiscSettings.java index 35b3b22..df93e23 100644 --- a/src/com/cherish/settings/fragments/MiscSettings.java +++ b/src/com/cherish/settings/fragments/MiscSettings.java @@ -39,10 +39,11 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; import android.provider.SearchIndexableResource; +import com.cherish.settings.fragments.SmartCharging; import java.util.ArrayList; import java.util.List; -@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) +@SearchIndexable public class MiscSettings extends SettingsPreferenceFragment implements OnPreferenceChangeListener { private static final String KEY_GAMES_SPOOF = "use_games_spoof"; @@ -50,9 +51,12 @@ public class MiscSettings extends SettingsPreferenceFragment implements private static final String SYS_GAMES_SPOOF = "persist.sys.pixelprops.games"; private static final String SYS_PHOTOS_SPOOF = "persist.sys.pixelprops.gphotos"; + + private static final String SMART_CHARGING = "smart_charging"; private SwitchPreference mGamesSpoof; private SwitchPreference mPhotosSpoof; + private Preference mSmartCharging; @Override public void onCreate(Bundle icicle) { @@ -60,16 +64,9 @@ public class MiscSettings extends SettingsPreferenceFragment implements ContentResolver resolver = getActivity().getContentResolver(); addPreferencesFromResource(R.xml.cherish_settings_misc); - - Resources res = null; - Context ctx = getContext(); - float density = Resources.getSystem().getDisplayMetrics().density; - - try { - res = ctx.getPackageManager().getResourcesForApplication("com.android.systemui"); - } catch (NameNotFoundException e) { - e.printStackTrace(); - } + + final PreferenceScreen prefScreen = getPreferenceScreen(); + final Resources res = getResources(); mGamesSpoof = (SwitchPreference) findPreference(KEY_GAMES_SPOOF); mGamesSpoof.setChecked(SystemProperties.getBoolean(SYS_GAMES_SPOOF, false)); @@ -78,6 +75,12 @@ public class MiscSettings extends SettingsPreferenceFragment implements mPhotosSpoof = (SwitchPreference) findPreference(KEY_PHOTOS_SPOOF); mPhotosSpoof.setChecked(SystemProperties.getBoolean(SYS_PHOTOS_SPOOF, true)); mPhotosSpoof.setOnPreferenceChangeListener(this); + + mSmartCharging = (Preference) prefScreen.findPreference(SMART_CHARGING); + boolean mSmartChargingSupported = res.getBoolean( + com.android.internal.R.bool.config_smartChargingAvailable); + if (!mSmartChargingSupported) + prefScreen.removePreference(mSmartCharging); } @@ -100,29 +103,19 @@ public class MiscSettings extends SettingsPreferenceFragment implements public int getMetricsCategory() { return MetricsProto.MetricsEvent.CHERISH_SETTINGS; } - - /** - * For Search. - */ - - public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = - new BaseSearchIndexProvider() { - - @Override - public List getXmlResourcesToIndex(Context context, - boolean enabled) { - ArrayList result = - new ArrayList(); - SearchIndexableResource sir = new SearchIndexableResource(context); - sir.xmlResId = R.xml.cherish_settings_misc; - result.add(sir); - return result; - } + public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = + new BaseSearchIndexProvider(R.xml.cherish_settings_misc) { @Override public List getNonIndexableKeys(Context context) { List keys = super.getNonIndexableKeys(context); + + boolean mSmartChargingSupported = context.getResources().getBoolean( + com.android.internal.R.bool.config_smartChargingAvailable); + if (!mSmartChargingSupported) + keys.add(SMART_CHARGING); + return keys; } - }; + }; } diff --git a/src/com/cherish/settings/fragments/SmartCharging.java b/src/com/cherish/settings/fragments/SmartCharging.java new file mode 100644 index 0000000..6d8cc8c --- /dev/null +++ b/src/com/cherish/settings/fragments/SmartCharging.java @@ -0,0 +1,68 @@ +/* + * 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 android.content.Context; +import android.content.ContentResolver; +import android.content.res.Resources; +import android.net.Uri; +import android.os.Bundle; +import android.os.Handler; +import android.os.UserHandle; +import android.provider.Settings; + +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; + +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.SettingsPreferenceFragment; + +public class SmartCharging extends SettingsPreferenceFragment { + + private static final String TAG = "SmartCharging"; + private static final String SMART_CHARGING_FOOTER = "smart_charging_footer"; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.smart_charging); + + findPreference(SMART_CHARGING_FOOTER).setTitle(R.string.smart_charging_footer); + } + + public static void reset(Context mContext) { + ContentResolver resolver = mContext.getContentResolver(); + Settings.System.putIntForUser(resolver, + Settings.System.SMART_CHARGING, 0, UserHandle.USER_CURRENT); + Settings.System.putIntForUser(resolver, + Settings.System.SMART_CHARGING_RESET_STATS, 0, UserHandle.USER_CURRENT); + Settings.System.putIntForUser(resolver, + Settings.System.SMART_CHARGING_LEVEL, 80, UserHandle.USER_CURRENT); + Settings.System.putIntForUser(resolver, + Settings.System.SMART_CHARGING_RESUME_LEVEL, 60, UserHandle.USER_CURRENT); + } + + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.CHERISH_SETTINGS; + } +}