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

Commit 0e15fe8e authored by Doris Ling's avatar Doris Ling
Browse files

Enable time zone preference on wifi-only device. 

When auto time zone preference is not available, it should be considered
disabled, so that user can still select time zone.

Change-Id: I9b17205a11ff512da02694e3bce06cfbd21dd7db
Fix: 34203177
Test: make RunSettingsRoboTests
parent 78427d74

src/com/android/settings/datetime/AutoTimeZonePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class AutoTimeZonePreferenceController extends PreferenceController 
    }



    public boolean isEnabled() {

        return Settings.Global.getInt(mContext.getContentResolver(),

        return isAvailable() && Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.AUTO_TIME_ZONE, 0) > 0;

    }

}

tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java

+19 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ public class AutoTimeZonePreferenceControllerTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        ShadowApplication.getInstance().setSystemService(Context.CONNECTIVITY_SERVICE, mCm);

        mContext = ShadowApplication.getInstance().getApplicationContext();

        mPreference = new Preference(mContext);

        when(mMockContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(mCm);
@@ -87,6 +88,24 @@ public class AutoTimeZonePreferenceControllerTest { 
        assertThat(mController.isAvailable()).isFalse();

    }



    @Test

    public void isFromSUW_notEnable() {

        mController = new AutoTimeZonePreferenceController(

            mMockContext, null /* callback */, true /* isFromSUW */);



        assertThat(mController.isEnabled()).isFalse();

    }



    @Test

    public void isWifiOnly_notEnable() {

        when(mCm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)).thenReturn(false);



        mController = new AutoTimeZonePreferenceController(

            mMockContext, null /* callback */, false /* isFromSUW */);



        assertThat(mController.isEnabled()).isFalse();

    }



    @Test

    public void testIsEnabled_shouldReadFromSettingsProvider() {

        mController = new AutoTimeZonePreferenceController(