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

Merge changes I0fde4f80,Iea1cff48 into pi-dev

Browse Source 
* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
This commit is contained in:
TreeHugger Robot
2018-03-29 23:49:22 +00:00
committed by Android (Google) Code Review
parent 9af6688a92 65983f71d5
commit 0ae4204f54
10 changed files with 106 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/DisplaySettings.java
View File

@@ -27,7 +27,6 @@ import com.android.settings.display.AutoRotatePreferenceController;
import com.android.settings.display.BrightnessLevelPreferenceController;
import com.android.settings.display.CameraGesturePreferenceController;
import com.android.settings.display.ColorModePreferenceController;
import com.android.settings.display.FontSizePreferenceController;
import com.android.settings.display.LiftToWakePreferenceController;
import com.android.settings.display.NightDisplayPreferenceController;
import com.android.settings.display.NightModePreferenceController;
@@ -86,7 +85,6 @@ public class DisplaySettings extends DashboardFragment {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new AutoRotatePreferenceController(context, lifecycle));
controllers.add(new CameraGesturePreferenceController(context));
controllers.add(new FontSizePreferenceController(context));
controllers.add(new LiftToWakePreferenceController(context));
controllers.add(new NightDisplayPreferenceController(context));
controllers.add(new NightModePreferenceController(context));

12
src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
View File

@@ -33,22 +33,18 @@ import com.android.settingslib.widget.FooterPreference;
import java.util.Date;
public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController {
private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
@VisibleForTesting
Date mDate;
private TimeZoneInfo mTimeZoneInfo;
private final DateFormat mDateFormat;
private final Date mDate;
public TimeZoneInfoPreferenceController(Context context) {
this(context, new Date());
}
@VisibleForTesting
TimeZoneInfoPreferenceController(Context context, Date date) {
super(context, PREFERENCE_KEY);
mDateFormat = DateFormat.getDateInstance(SimpleDateFormat.LONG);
mDateFormat.setContext(DisplayContext.CAPITALIZATION_NONE);
mDate = date;
mDate = new Date();
}
@Override

3
src/com/android/settings/datetime/timezone/TimeZoneSettings.java
View File

@@ -102,15 +102,12 @@ public class TimeZoneSettings extends DashboardFragment {
RegionZonePreferenceController regionZonePreferenceController =
new RegionZonePreferenceController(context);
regionZonePreferenceController.setOnClickListener(this::onRegionZonePreferenceClicked);
TimeZoneInfoPreferenceController timeZoneInfoPreferenceController =
new TimeZoneInfoPreferenceController(context);
FixedOffsetPreferenceController fixedOffsetPreferenceController =
new FixedOffsetPreferenceController(context);
fixedOffsetPreferenceController.setOnClickListener(this::startFixedOffsetPicker);
controllers.add(regionPreferenceController);
controllers.add(regionZonePreferenceController);
controllers.add(timeZoneInfoPreferenceController);
controllers.add(fixedOffsetPreferenceController);
return controllers;
}

26
src/com/android/settings/display/FontSizePreferenceController.java
View File

@@ -16,34 +16,24 @@ package com.android.settings.display;
import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settings.core.BasePreferenceController;
public class FontSizePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
public class FontSizePreferenceController extends BasePreferenceController {
private static final String KEY_FONT_SIZE = "font_size";
public FontSizePreferenceController(Context context) {
super(context);
public FontSizePreferenceController(Context context, String key) {
super(context, key);
}
@Override
public boolean isAvailable() {
return true;
public int getAvailabilityStatus() {
return AVAILABLE;
}
@Override
public String getPreferenceKey() {
return KEY_FONT_SIZE;
}
@Override
public void updateState(Preference preference) {
public CharSequence getSummary() {
final float currentScale = Settings.System.getFloat(mContext.getContentResolver(),
Settings.System.FONT_SCALE, 1.0f);
final Resources res = mContext.getResources();
@@ -51,6 +41,6 @@ public class FontSizePreferenceController extends AbstractPreferenceController i
final String[] strEntryValues = res.getStringArray(R.array.entryvalues_font_size);
final int index = ToggleFontSizePreferenceFragment.fontSizeValueToIndex(currentScale,
strEntryValues);
preference.setSummary(entries[index]);
return entries[index];
}
}