Merge "Add support to configure double line clock in lockscreen [2/2]" into main (3be411d5) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/display/LockscreenClockPreferenceController.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@ public class LockscreenClockPreferenceController extends TogglePreferenceControl

		@Override
		public boolean isChecked() {
		return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY, 1) != 0;
		return Settings.Secure.getInt(mContext.getContentResolver(), SETTING_KEY,
		getDoublelineClockDefault()) != 0;
		}

		@Override
		@@ -67,4 +68,9 @@ public class LockscreenClockPreferenceController extends TogglePreferenceControl
		public int getSliceHighlightMenuRes() {
		return R.string.menu_key_display;
		}

		protected int getDoublelineClockDefault() {
		return mContext.getResources()
		.getInteger(com.android.internal.R.integer.config_doublelineClockDefault);
		}
		}

tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -16,10 +16,14 @@

		package com.android.settings.display;

		import static org.mockito.Mockito.when;
		import static org.mockito.Mockito.spy;

		import static com.google.common.truth.Truth.assertThat;

		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.res.Resources;
		import android.provider.Settings;

		import androidx.preference.Preference;
		@@ -42,6 +46,8 @@ public class LockscreenClockPreferenceControllerTest {
		private ContentResolver mContentResolver;
		private LockscreenClockPreferenceController mController;

		private Resources mResources;

		@Mock
		private Preference mPreference;

		@@ -51,12 +57,18 @@ public class LockscreenClockPreferenceControllerTest {
		mContext = RuntimeEnvironment.application;
		mContentResolver = mContext.getContentResolver();
		mController = new LockscreenClockPreferenceController(mContext, TEST_KEY);
		mResources = spy(mContext.getResources());
		Context mClockContext = org.mockito.Mockito.mock(Context.class);
		when(mClockContext.getResources()).thenReturn(mResources);
		}

		@Test
		public void isChecked_SettingIs1_returnTrue() {
		Settings.Secure.putInt(mContentResolver, SETTING_KEY, 1);

		when(mResources.getInteger(com.android.internal.R.integer.config_doublelineClockDefault))
		.thenReturn(1);

		assertThat(mController.isChecked()).isTrue();
		}

		@@ -64,6 +76,9 @@ public class LockscreenClockPreferenceControllerTest {
		public void isChecked_SettingIs0_returnFalse() {
		Settings.Secure.putInt(mContentResolver, SETTING_KEY, 0);

		when(mResources.getInteger(com.android.internal.R.integer.config_doublelineClockDefault))
		.thenReturn(0);

		assertThat(mController.isChecked()).isFalse();
		}