Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename PhenotypeHelper to DeviceConfigHelper

Browse Source 
This class is used for simplifying interaction with the device
configuration and for testing. The new name is more descriptive of its
intended purpose.

Test: Tested locally
BUG:143952102
Change-Id: I5d9edf518b92f48d73e2ed5d142a162d348d24ba
This commit is contained in:
Govinda Wasserman
2019-11-12 13:48:34 -05:00
parent b814d6b317
commit 2f3a476b23
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
View File

@@ -71,7 +71,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac
private final Runnable mHideHandles = this::hideHandles; private final Runnable mHideHandles = this::hideHandles;
private final Runnable mShowAndGo = this::showAndGoInternal; private final Runnable mShowAndGo = this::showAndGoInternal;
private final Provider<AssistHandleViewController> mAssistHandleViewController; private final Provider<AssistHandleViewController> mAssistHandleViewController;
private final PhenotypeHelper mPhenotypeHelper; private final DeviceConfigHelper mDeviceConfigHelper;
private final Map<AssistHandleBehavior, BehaviorController> mBehaviorMap; private final Map<AssistHandleBehavior, BehaviorController> mBehaviorMap;
private boolean mHandlesShowing = false; private boolean mHandlesShowing = false;
@@ -90,7 +90,7 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac
AssistUtils assistUtils, AssistUtils assistUtils,
@Named(ASSIST_HANDLE_THREAD_NAME) Handler handler, @Named(ASSIST_HANDLE_THREAD_NAME) Handler handler,
Provider<AssistHandleViewController> assistHandleViewController, Provider<AssistHandleViewController> assistHandleViewController,
PhenotypeHelper phenotypeHelper, DeviceConfigHelper deviceConfigHelper,
Map<AssistHandleBehavior, BehaviorController> behaviorMap, Map<AssistHandleBehavior, BehaviorController> behaviorMap,
NavigationModeController navigationModeController, NavigationModeController navigationModeController,
DumpController dumpController) { DumpController dumpController) {
@@ -98,14 +98,14 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac
mAssistUtils = assistUtils; mAssistUtils = assistUtils;
mHandler = handler; mHandler = handler;
mAssistHandleViewController = assistHandleViewController; mAssistHandleViewController = assistHandleViewController;
mPhenotypeHelper = phenotypeHelper; mDeviceConfigHelper = deviceConfigHelper;
mBehaviorMap = behaviorMap; mBehaviorMap = behaviorMap;
mInGesturalMode = QuickStepContract.isGesturalMode( mInGesturalMode = QuickStepContract.isGesturalMode(
navigationModeController.addListener(this::handleNavigationModeChange)); navigationModeController.addListener(this::handleNavigationModeChange));
setBehavior(getBehaviorMode()); setBehavior(getBehaviorMode());
mPhenotypeHelper.addOnPropertiesChangedListener( mDeviceConfigHelper.addOnPropertiesChangedListener(
mHandler::post, mHandler::post,
(properties) -> { (properties) -> {
if (properties.getKeyset().contains( if (properties.getKeyset().contains(
@@ -205,19 +205,19 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac
} }
private long getShownFrequencyThreshold() { private long getShownFrequencyThreshold() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS,
DEFAULT_SHOWN_FREQUENCY_THRESHOLD_MS); DEFAULT_SHOWN_FREQUENCY_THRESHOLD_MS);
} }
private long getShowAndGoDuration() { private long getShowAndGoDuration() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DURATION_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DURATION_MS,
DEFAULT_SHOW_AND_GO_DURATION_MS); DEFAULT_SHOW_AND_GO_DURATION_MS);
} }
private String getBehaviorMode() { private String getBehaviorMode() {
return mPhenotypeHelper.getString( return mDeviceConfigHelper.getString(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_BEHAVIOR_MODE, SystemUiDeviceConfigFlags.ASSIST_HANDLES_BEHAVIOR_MODE,
DEFAULT_BEHAVIOR.toString()); DEFAULT_BEHAVIOR.toString());
} }

24
packages/SystemUI/src/com/android/systemui/assist/AssistHandleReminderExpBehavior.java
View File

@@ -155,7 +155,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
private final Clock mClock; private final Clock mClock;
private final Handler mHandler; private final Handler mHandler;
private final PhenotypeHelper mPhenotypeHelper; private final DeviceConfigHelper mDeviceConfigHelper;
private final Lazy<StatusBarStateController> mStatusBarStateController; private final Lazy<StatusBarStateController> mStatusBarStateController;
private final Lazy<ActivityManagerWrapper> mActivityManagerWrapper; private final Lazy<ActivityManagerWrapper> mActivityManagerWrapper;
private final Lazy<OverviewProxyService> mOverviewProxyService; private final Lazy<OverviewProxyService> mOverviewProxyService;
@@ -189,7 +189,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
AssistHandleReminderExpBehavior( AssistHandleReminderExpBehavior(
@Named(UPTIME_NAME) Clock clock, @Named(UPTIME_NAME) Clock clock,
@Named(ASSIST_HANDLE_THREAD_NAME) Handler handler, @Named(ASSIST_HANDLE_THREAD_NAME) Handler handler,
PhenotypeHelper phenotypeHelper, DeviceConfigHelper deviceConfigHelper,
Lazy<StatusBarStateController> statusBarStateController, Lazy<StatusBarStateController> statusBarStateController,
Lazy<ActivityManagerWrapper> activityManagerWrapper, Lazy<ActivityManagerWrapper> activityManagerWrapper,
Lazy<OverviewProxyService> overviewProxyService, Lazy<OverviewProxyService> overviewProxyService,
@@ -199,7 +199,7 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
Lazy<BroadcastDispatcher> broadcastDispatcher) { Lazy<BroadcastDispatcher> broadcastDispatcher) {
mClock = clock; mClock = clock;
mHandler = handler; mHandler = handler;
mPhenotypeHelper = phenotypeHelper; mDeviceConfigHelper = deviceConfigHelper;
mStatusBarStateController = statusBarStateController; mStatusBarStateController = statusBarStateController;
mActivityManagerWrapper = activityManagerWrapper; mActivityManagerWrapper = activityManagerWrapper;
mOverviewProxyService = overviewProxyService; mOverviewProxyService = overviewProxyService;
@@ -465,55 +465,55 @@ final class AssistHandleReminderExpBehavior implements BehaviorController {
} }
private long getLearningTimeMs() { private long getLearningTimeMs() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_TIME_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_TIME_MS,
DEFAULT_LEARNING_TIME_MS); DEFAULT_LEARNING_TIME_MS);
} }
private int getLearningCount() { private int getLearningCount() {
return mPhenotypeHelper.getInt( return mDeviceConfigHelper.getInt(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_COUNT, SystemUiDeviceConfigFlags.ASSIST_HANDLES_LEARN_COUNT,
DEFAULT_LEARNING_COUNT); DEFAULT_LEARNING_COUNT);
} }
private long getShowAndGoDelayedShortDelayMs() { private long getShowAndGoDelayedShortDelayMs() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS,
DEFAULT_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS); DEFAULT_SHOW_AND_GO_DELAYED_SHORT_DELAY_MS);
} }
private long getShowAndGoDelayedLongDelayMs() { private long getShowAndGoDelayedLongDelayMs() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_LONG_DELAY_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAYED_LONG_DELAY_MS,
DEFAULT_SHOW_AND_GO_DELAYED_LONG_DELAY_MS); DEFAULT_SHOW_AND_GO_DELAYED_LONG_DELAY_MS);
} }
private long getShowAndGoDelayResetTimeoutMs() { private long getShowAndGoDelayResetTimeoutMs() {
return mPhenotypeHelper.getLong( return mDeviceConfigHelper.getLong(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS,
DEFAULT_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS); DEFAULT_SHOW_AND_GO_DELAY_RESET_TIMEOUT_MS);
} }
private boolean getSuppressOnLockscreen() { private boolean getSuppressOnLockscreen() {
return mPhenotypeHelper.getBoolean( return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LOCKSCREEN, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LOCKSCREEN,
DEFAULT_SUPPRESS_ON_LOCKSCREEN); DEFAULT_SUPPRESS_ON_LOCKSCREEN);
} }
private boolean getSuppressOnLauncher() { private boolean getSuppressOnLauncher() {
return mPhenotypeHelper.getBoolean( return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LAUNCHER, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_LAUNCHER,
DEFAULT_SUPPRESS_ON_LAUNCHER); DEFAULT_SUPPRESS_ON_LAUNCHER);
} }
private boolean getSuppressOnApps() { private boolean getSuppressOnApps() {
return mPhenotypeHelper.getBoolean( return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_APPS, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SUPPRESS_ON_APPS,
DEFAULT_SUPPRESS_ON_APPS); DEFAULT_SUPPRESS_ON_APPS);
} }
private boolean getShowWhenTaught() { private boolean getShowWhenTaught() {
return mPhenotypeHelper.getBoolean( return mDeviceConfigHelper.getBoolean(
SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_WHEN_TAUGHT, SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOW_WHEN_TAUGHT,
DEFAULT_SHOW_WHEN_TAUGHT); DEFAULT_SHOW_WHEN_TAUGHT);
} }

6
packages/SystemUI/src/com/android/systemui/assist/PhenotypeHelper.java → packages/SystemUI/src/com/android/systemui/assist/DeviceConfigHelper.java
View File

@@ -28,15 +28,15 @@ import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
/** /**
* Wrapper class for retrieving phenotype flag values. * Wrapper class for retrieving System UI device configuration values.
* *
* Can be mocked in tests for ease of testing the effects of particular values. * Can be mocked in tests for ease of testing the effects of particular values.
*/ */
@Singleton @Singleton
public class PhenotypeHelper { public class DeviceConfigHelper {
@Inject @Inject
public PhenotypeHelper() {} public DeviceConfigHelper() {}
public long getLong(String name, long defaultValue) { public long getLong(String name, long defaultValue) {
return whitelistIpcs(() -> return whitelistIpcs(() ->

8
packages/SystemUI/tests/src/com/android/systemui/assist/AssistHandleBehaviorControllerTest.java
View File

@@ -65,7 +65,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase {
@Mock private AssistUtils mMockAssistUtils; @Mock private AssistUtils mMockAssistUtils;
@Mock private Handler mMockHandler; @Mock private Handler mMockHandler;
@Mock private PhenotypeHelper mMockPhenotypeHelper; @Mock private DeviceConfigHelper mMockDeviceConfigHelper;
@Mock private AssistHandleOffBehavior mMockOffBehavior; @Mock private AssistHandleOffBehavior mMockOffBehavior;
@Mock private AssistHandleLikeHomeBehavior mMockLikeHomeBehavior; @Mock private AssistHandleLikeHomeBehavior mMockLikeHomeBehavior;
@Mock private AssistHandleReminderExpBehavior mMockReminderExpBehavior; @Mock private AssistHandleReminderExpBehavior mMockReminderExpBehavior;
@@ -97,7 +97,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase {
mMockAssistUtils, mMockAssistUtils,
mMockHandler, mMockHandler,
() -> mMockAssistHandleViewController, () -> mMockAssistHandleViewController,
mMockPhenotypeHelper, mMockDeviceConfigHelper,
behaviorMap, behaviorMap,
mMockNavigationModeController, mMockNavigationModeController,
mMockDumpController); mMockDumpController);
@@ -216,7 +216,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase {
public void showAndGo_doesNothingIfRecentlyHidden() { public void showAndGo_doesNothingIfRecentlyHidden() {
// Arrange // Arrange
when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME);
when(mMockPhenotypeHelper.getLong( when(mMockDeviceConfigHelper.getLong(
eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS), eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS),
anyLong())).thenReturn(10000L); anyLong())).thenReturn(10000L);
mAssistHandleBehaviorController.showAndGo(); mAssistHandleBehaviorController.showAndGo();
@@ -297,7 +297,7 @@ public class AssistHandleBehaviorControllerTest extends SysuiTestCase {
public void showAndGoDelayed_doesNothingIfRecentlyHidden() { public void showAndGoDelayed_doesNothingIfRecentlyHidden() {
// Arrange // Arrange
when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME); when(mMockAssistUtils.getAssistComponentForUser(anyInt())).thenReturn(COMPONENT_NAME);
when(mMockPhenotypeHelper.getLong( when(mMockDeviceConfigHelper.getLong(
eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS), eq(SystemUiDeviceConfigFlags.ASSIST_HANDLES_SHOWN_FREQUENCY_THRESHOLD_MS),
anyLong())).thenReturn(10000L); anyLong())).thenReturn(10000L);
mAssistHandleBehaviorController.showAndGo(); mAssistHandleBehaviorController.showAndGo();