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

Merge "Separate personal/work tab in LocationSettings"

Browse Source
This commit is contained in:
Raff Tsai
2019-11-27 16:42:03 +00:00
committed by Android (Google) Code Review
parent 2280fe5ce0 5089629bf5
commit e7ff0891bb
14 changed files with 403 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/assets/grandfather_not_implementing_index_provider
View File

@@ -32,6 +32,7 @@ com.android.settings.bluetooth.DevicePickerFragment
com.android.settings.dashboard.profileselector.ProfileSelectAccountFragment
com.android.settings.dashboard.profileselector.ProfileSelectManageApplications
com.android.settings.dashboard.profileselector.ProfileSelectStorageFragment
com.android.settings.dashboard.profileselector.ProfileSelectLocationFragment
com.android.settings.datausage.AppDataUsage
com.android.settings.datausage.DataUsageList
com.android.settings.datausage.DataUsageSummary
@@ -54,6 +55,8 @@ com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
com.android.settings.inputmethod.KeyboardLayoutPickerFragment
com.android.settings.inputmethod.SpellCheckersSettings
com.android.settings.localepicker.LocaleListEditor
com.android.settings.location.LocationPersonalSettings
com.android.settings.location.LocationWorkProfileSettings
com.android.settings.network.ApnEditor
com.android.settings.network.ApnSettings
com.android.settings.network.telephony.NetworkSelectSettings

8
tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
View File

@@ -15,9 +15,6 @@
*/
package com.android.settings.location;
import static com.android.settings.location.LocationServicePreferenceController.KEY_LOCATION_SERVICES;
import static com.android.settings.location.LocationServicePreferenceController.KEY_LOCATION_SERVICES_MANAGED;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -63,6 +60,8 @@ import java.util.Map;
@Config(shadows = ShadowUserManager.class)
public class LocationServicePreferenceControllerTest {
private static final String KEY_LOCATION_SERVICES = "location_service";
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private LocationSettings mFragment;
@Mock
@@ -93,10 +92,7 @@ public class LocationServicePreferenceControllerTest {
mController.mInjector = mSettingsInjector;
final String key = mController.getPreferenceKey();
when(mScreen.findPreference(key)).thenReturn(mCategoryPrimary);
when(mScreen.findPreference(KEY_LOCATION_SERVICES_MANAGED)).thenReturn(
mCategoryManaged);
when(mCategoryPrimary.getKey()).thenReturn(key);
when(mCategoryManaged.getKey()).thenReturn(KEY_LOCATION_SERVICES_MANAGED);
when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE))
.thenReturn(mDevicePolicyManager);
}