Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ae4204f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I0fde4f80,Iea1cff48 into pi-dev 

* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
parents 9af6688a 65983f71

res/xml/display_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
        android:key="font_size"

        android:title="@string/title_font_size"

        android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"

        settings:controller="com.android.settings.display.FontSizePreferenceController"

        settings:keywords="@string/keywords_display_font_size" />



    <com.android.settings.display.ScreenZoomPreference

res/xml/time_zone_prefs.xml

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:key="time_zone_settings_screen"

    android:title="@string/date_time_set_timezone">
@@ -29,7 +30,9 @@ 
            android:key="region_zone"

            android:title="@string/date_time_set_timezone_title"

            android:summary="@string/summary_placeholder" />

        <com.android.settingslib.widget.FooterPreference/>

        <com.android.settingslib.widget.FooterPreference

            android:key="footer_preference"

            settings:controller="com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController" />

    </PreferenceCategory>



    <PreferenceCategory

src/com/android/settings/DisplaySettings.java

+0 −2
Original line number Diff line number Diff line
@@ -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));

src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java

+4 −8
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/datetime/timezone/TimeZoneSettings.java

+0 −3
Original line number Diff line number Diff line
@@ -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;

    }