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

Commit 65983f71 authored by Fan Zhang's avatar Fan Zhang
Browse files

Update TimezoneInfoPrefController to register in xml 

Test: robotest
Bug: 77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
parent fc1590e9

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/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;

    }

tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ com.android.settings.bluetooth.BluetoothSwitchPreferenceController 
com.android.settings.connecteddevice.ConnectedDeviceGroupController

com.android.settings.connecteddevice.SavedDeviceGroupController

com.android.settings.datausage.DataUsageSummaryPreferenceController

com.android.settings.datetime.timezone.TimeZoneInfoPreferenceController

com.android.settings.fuelgauge.RestrictAppPreferenceController

com.android.settings.fuelgauge.batterysaver.AutoBatterySeekBarPreferenceController

com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController

tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java

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


package com.android.settings.datetime.timezone;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.spy;



import android.support.v7.preference.Preference;



import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
@@ -28,9 +31,6 @@ import org.robolectric.RuntimeEnvironment; 
import java.util.Date;

import java.util.Locale;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.spy;



@RunWith(SettingsRobolectricTestRunner.class)

public class TimeZoneInfoPreferenceControllerTest {
@@ -41,7 +41,8 @@ public class TimeZoneInfoPreferenceControllerTest { 


        TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles");

        TimeZoneInfoPreferenceController controller =

                new TimeZoneInfoPreferenceController(RuntimeEnvironment.application, now);

                new TimeZoneInfoPreferenceController(RuntimeEnvironment.application);

        controller.mDate = now;

        controller.setTimeZoneInfo(timeZoneInfo);

        Preference preference = spy(new Preference(RuntimeEnvironment.application));

        controller.updateState(preference);