PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Remove master swtich from battery saver.

Browse Source 
And make it a normal switch called "Always on".  Better reflects
the actual effect.

Change-Id: I9f801ddfff39591cb19d665f61a1a05bda317888
This commit is contained in:
John Spurlock
2014-06-11 18:44:24 -04:00
parent 2f2cbbc760
commit 5845d98a8a
3 changed files with 44 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -3725,6 +3725,9 @@
<!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
<string name="battery_saver">Battery saver</string>
<!-- [CHAR_LIMIT=40] Battery saver: Title for always on option -->
<string name="battery_saver_always_on_title">Always on</string>
<!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
<string name="battery_saver_turn_on_automatically_title">Turn on automatically</string>
@@ -3735,7 +3738,7 @@
<string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
<!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
<string name="battery_saver_description">To help improve battery life, Battery saver will reduce your device’s performance.\n\nBattery saver will turn off when your device is plugged in.</string>
<string name="battery_saver_description">To help improve battery life, Battery saver will reduce your device’s performance.\n\nBattery saver will be disabled when your device is plugged in.</string>
<!-- Process Stats strings -->
<skip />

8
res/xml/battery_saver_settings.xml
View File

@@ -18,6 +18,14 @@
android:title="@string/battery_saver"
android:key="battery_saver">
<!-- Always on -->
<SwitchPreference
android:key="always_on"
android:title="@string/battery_saver_always_on_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" />
<!-- Turn on automatically -->
<com.android.settings.notification.DropDownPreference
android:key="turn_on_automatically"

88
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

@@ -24,29 +24,24 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings.Global;
import android.util.Log;
import android.widget.Switch;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.SettingPref;
import com.android.settings.widget.SwitchBar;
public class BatterySaverSettings extends SettingsPreferenceFragment
implements SwitchBar.OnSwitchChangeListener {
public class BatterySaverSettings extends SettingsPreferenceFragment {
private static final String TAG = "BatterySaverSettings";
private static final String KEY_ALWAYS_ON = "always_on";
private static final String KEY_TURN_ON_AUTOMATICALLY = "turn_on_automatically";
private static final long WAIT_FOR_SWITCH_ANIM = 500;
private final H mHandler = new H();
private final Handler mHandler = new Handler();
private final SettingsObserver mSettingsObserver = new SettingsObserver(mHandler);
private Context mContext;
private SwitchBar mSwitchBar;
private boolean mSwitchBarListenerAdded;
private SettingPref mAlwaysOnPref;
private SettingPref mTriggerPref;
@Override
@@ -56,8 +51,21 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
addPreferencesFromResource(R.xml.battery_saver_settings);
mContext = getActivity();
mSwitchBar = ((SettingsActivity) mContext).getSwitchBar();
updateSwitchBar();
mAlwaysOnPref = new SettingPref(SettingPref.TYPE_GLOBAL, KEY_ALWAYS_ON,
Global.LOW_POWER_MODE, 0) {
@Override
protected boolean setSetting(Context context, int value) {
mHandler.removeCallbacks(mStartMode);
if (value == 0) {
return super.setSetting(context, value);
} else {
// about lose animations, make sure we don't turn the mode on until the switch
// stops moving
mHandler.postDelayed(mStartMode, WAIT_FOR_SWITCH_ANIM);
return true;
}
}
};
mTriggerPref = new SettingPref(SettingPref.TYPE_GLOBAL, KEY_TURN_ON_AUTOMATICALLY,
Global.LOW_POWER_MODE_TRIGGER_LEVEL,
mContext.getResources().getInteger(
@@ -71,76 +79,34 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
return res.getString(R.string.battery_saver_turn_on_automatically_never);
}
};
mAlwaysOnPref.init(this);
mTriggerPref.init(this);
}
private void updateSwitchBar() {
final boolean mode = Global.getInt(getContentResolver(), Global.LOW_POWER_MODE, 0) != 0;
if (mSwitchBarListenerAdded) {
mSwitchBar.removeOnSwitchChangeListener(this);
}
mSwitchBar.getSwitch().setChecked(mode);
if (mSwitchBarListenerAdded) {
mSwitchBar.addOnSwitchChangeListener(this);
}
}
private void updateTriggerLevel() {
mTriggerPref.update(mContext);
}
@Override
public void onResume() {
super.onResume();
updateSwitchBar();
mSettingsObserver.setListening(true);
mSwitchBar.show();
mSwitchBar.addOnSwitchChangeListener(this);
mSwitchBarListenerAdded = true;
}
@Override
public void onPause() {
super.onPause();
mSettingsObserver.setListening(false);
if (mSwitchBarListenerAdded) {
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBarListenerAdded = false;
}
mSwitchBar.hide();
}
private final Runnable mStartMode = new Runnable() {
@Override
public void onSwitchChanged(Switch switchView, boolean isChecked) {
mHandler.postSetMode(isChecked);
}
private void handleSetMode(final boolean mode) {
public void run() {
AsyncTask.execute(new Runnable() {
@Override
public void run() {
Log.d(TAG, "LOW_POWER_MODE from settings: " + mode);
Global.putInt(getContentResolver(), Global.LOW_POWER_MODE, mode ? 1 : 0);
Log.d(TAG, "Starting LOW_POWER_MODE from settings");
Global.putInt(mContext.getContentResolver(), Global.LOW_POWER_MODE, 1);
}
});
}
private final class H extends Handler {
private static final int SET_MODE = 1;
public void postSetMode(boolean mode) {
removeMessages(SET_MODE);
final Message m = obtainMessage(SET_MODE, mode ? 1 : 0, 0);
sendMessageDelayed(m, mode ? WAIT_FOR_SWITCH_ANIM : 0);
}
@Override
public void handleMessage(Message msg) {
if (msg.what == SET_MODE) {
handleSetMode(msg.arg1 != 0);
}
}
}
};
private final class SettingsObserver extends ContentObserver {
private final Uri LOW_POWER_MODE_URI = Global.getUriFor(Global.LOW_POWER_MODE);
@@ -154,10 +120,10 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
@Override
public void onChange(boolean selfChange, Uri uri) {
if (LOW_POWER_MODE_URI.equals(uri)) {
updateSwitchBar();
mAlwaysOnPref.update(mContext);
}
if (LOW_POWER_MODE_TRIGGER_LEVEL_URI.equals(uri)) {
updateTriggerLevel();
mTriggerPref.update(mContext);
}
}