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

Merge "Add support to hide developer tile based on a flag" into tm-qpr-dev am: f1807d897b am: 6d69676059

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

Change-Id: If41ee31670d44d19c0b4faf2fb3d258203191abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ats Jenk
2022-09-27 16:49:59 +00:00
committed by Automerger Merge Worker
parent 61170b1c0b 6d69676059
commit ecc62eb469
4 changed files with 84 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
View File

@@ -19,7 +19,9 @@ package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,6 +32,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.os.RemoteException;
import android.service.quicksettings.TileService;
@@ -50,6 +53,7 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.shadows.ShadowSystemProperties;
import org.robolectric.util.ReflectionHelpers;
import java.util.Arrays;
@@ -88,11 +92,7 @@ public class DevelopmentTilePreferenceControllerTest {
public void display_hasTileService_shouldDisplay() {
final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
.setPackage(mContext.getPackageName());
final ResolveInfo info = new ResolveInfo();
info.serviceInfo = new FakeServiceInfo();
info.serviceInfo.name = "abc";
info.serviceInfo.icon = R.drawable.ic_settings_24dp;
info.serviceInfo.packageName = mContext.getPackageName();
final ResolveInfo info = createFakeInfo("abc");
mShadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info));
mController.displayPreference(mScreen);
@@ -100,6 +100,36 @@ public class DevelopmentTilePreferenceControllerTest {
verify(mScreen, atLeastOnce()).addPreference(any(Preference.class));
}
@Test
public void display_flagDefinedAndOn_shouldDisplay() {
ShadowSystemProperties.override("tile_flag", "1");
final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
.setPackage(mContext.getPackageName());
final ResolveInfo info = createFakeInfo("abc");
info.serviceInfo.metaData = createFlagMetadata("tile_flag");
mShadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info));
mController.displayPreference(mScreen);
verify(mScreen, atLeastOnce()).addPreference(argThat(pref -> pref.getKey().equals("abc")));
}
@Test
public void display_flagDefinedAndOff_shouldHide() {
ShadowSystemProperties.override("tile_flag" , "0");
final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE)
.setPackage(mContext.getPackageName());
final ResolveInfo info = createFakeInfo("abc");
info.serviceInfo.metaData = createFlagMetadata("tile_flag");
mShadowPackageManager.setResolveInfosForIntent(tileProbe, Arrays.asList(info));
mController.displayPreference(mScreen);
verify(mScreen, never()).addPreference(argThat(pref -> pref.getKey().equals("abc")));
}
@Test
public void preferenceChecked_shouldAddTile() throws RemoteException {
SwitchPreference preference = createPreference(/* defaultCheckedState = */ false);
@@ -132,6 +162,21 @@ public class DevelopmentTilePreferenceControllerTest {
return preference;
}
private ResolveInfo createFakeInfo(String name) {
final ResolveInfo info = new ResolveInfo();
info.serviceInfo = new FakeServiceInfo();
info.serviceInfo.name = name;
info.serviceInfo.icon = R.drawable.ic_settings_24dp;
info.serviceInfo.packageName = mContext.getPackageName();
return info;
}
private Bundle createFlagMetadata(String flag) {
Bundle metaData = new Bundle();
metaData.putString(DevelopmentTiles.META_DATA_REQUIRES_SYSTEM_PROPERTY, flag);
return metaData;
}
private static class FakeServiceInfo extends ServiceInfo {
public String loadLabel(PackageManager mgr) {