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

Merge "Polish some behaviors of the battery saver schedule screen"

Browse Source
This commit is contained in:
Salvador Martinez
2019-01-10 22:58:55 +00:00
committed by Android (Google) Code Review
parent 3137429192 cd365b6533
commit 0c388c5f4e
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
View File

@@ -54,9 +54,11 @@ public class BatterySaverScheduleSeekBarController implements
mContext = context; mContext = context;
mSeekBarPreference = new SeekBarPreference(context); mSeekBarPreference = new SeekBarPreference(context);
mSeekBarPreference.setOnPreferenceChangeListener(this); mSeekBarPreference.setOnPreferenceChangeListener(this);
mSeekBarPreference.setMax(BatterySaverScheduleSeekBarController.MAX_SEEKBAR_VALUE); mSeekBarPreference.setContinuousUpdates(true);
mSeekBarPreference.setMin(BatterySaverScheduleSeekBarController.MIN_SEEKBAR_VALUE); mSeekBarPreference.setMax(MAX_SEEKBAR_VALUE);
mSeekBarPreference.setMin(MIN_SEEKBAR_VALUE);
mSeekBarPreference.setKey(KEY_BATTERY_SAVER_SEEK_BAR); mSeekBarPreference.setKey(KEY_BATTERY_SAVER_SEEK_BAR);
updateSeekBar();
} }
@Override @Override
@@ -83,11 +85,12 @@ public class BatterySaverScheduleSeekBarController implements
if (threshold <= 0) { if (threshold <= 0) {
mSeekBarPreference.setVisible(false); mSeekBarPreference.setVisible(false);
} else { } else {
final int currentSeekbarValue = Math.max(threshold / 5, MIN_SEEKBAR_VALUE);
mSeekBarPreference.setVisible(true); mSeekBarPreference.setVisible(true);
mSeekBarPreference.setProgress(MIN_SEEKBAR_VALUE); mSeekBarPreference.setProgress(currentSeekbarValue);
mSeekBarPreference.setTitle(mContext.getString( mSeekBarPreference.setTitle(mContext.getString(
R.string.battery_saver_seekbar_title, R.string.battery_saver_seekbar_title,
Utils.formatPercentage(MIN_SEEKBAR_VALUE * 5))); Utils.formatPercentage(currentSeekbarValue * 5)));
} }
} else { } else {
mSeekBarPreference.setVisible(false); mSeekBarPreference.setVisible(false);

11
src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSettings.java
View File

@@ -17,10 +17,14 @@
package com.android.settings.fuelgauge.batterysaver; package com.android.settings.fuelgauge.batterysaver;
import android.content.Context; import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.R; import com.android.settings.R;
@@ -58,6 +62,13 @@ public class BatterySaverScheduleSettings extends RadioButtonPickerFragment {
context, mSeekBarController); context, mSeekBarController);
} }
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
setDivider(new ColorDrawable(Color.TRANSPARENT));
setDividerHeight(0);
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);