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

Add missing settings strings.

Browse Source 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
This commit is contained in:
Jonathan Scott
2022-04-11 09:49:17 +00:00
parent afe6d302e4
commit b7f4f56cad
63 changed files with 470 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
View File

@@ -18,8 +18,11 @@ package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import androidx.fragment.app.Fragment;
@@ -51,6 +54,8 @@ public class FeedbackPreferenceControllerTest {
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
doReturn(mock(DevicePolicyManager.class)).when(mContext)
.getSystemService(Context.DEVICE_POLICY_SERVICE);
mController = new FeedbackPreferenceController(mFragment, mContext);
final String prefKey = mController.getPreferenceKey();
when(mScreen.findPreference(prefKey)).thenReturn(mPreference);