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

Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Pietal
2023-10-04 14:54:22 +00:00
committed by Automerger Merge Worker
parent f0ba9c8b60 3be411d513
commit 705507d68f
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/display/LockscreenClockPreferenceController.java
View File

@@ -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);
}
}

15
tests/robotests/src/com/android/settings/display/LockscreenClockPreferenceControllerTest.java
View File

@@ -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();
}