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

Migrate OneHanded to WM shell (2/n)

Browse Source 
Remove OneHandedModule for refactoring and further migration works

Bug: 161980408
Bug: 164962096
Test: atest com.android.systemui.onehanded
Change-Id: I0f30163e099626b7fa0f2fa6142cb617b288b22c
This commit is contained in:
Tony Huang
2020-08-17 16:34:59 +08:00
parent d498c4d5a3
commit 67e349f064
14 changed files with 57 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CarSystemUI/src/com/android/systemui/CarSysUIComponent.java
View File

@@ -22,7 +22,6 @@ import com.android.systemui.dagger.SysUIComponent;
import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.SystemServicesModule;
import com.android.systemui.dagger.SystemUIModule;
import com.android.systemui.onehanded.dagger.OneHandedModule;
import com.android.systemui.pip.phone.dagger.PipModule;
import dagger.Subcomponent;
@@ -36,7 +35,6 @@ import dagger.Subcomponent;
DependencyProvider.class,
DependencyBinder.class,
PipModule.class,
OneHandedModule.class,
SystemServicesModule.class,
SystemUIModule.class,
CarSystemUIModule.class,

2
packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java
View File

@@ -22,7 +22,6 @@ import com.android.systemui.InitController;
import com.android.systemui.SystemUIAppComponentFactory;
import com.android.systemui.dump.DumpManager;
import com.android.systemui.keyguard.KeyguardSliceProvider;
import com.android.systemui.onehanded.dagger.OneHandedModule;
import com.android.systemui.pip.phone.dagger.PipModule;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.util.InjectionInflationController;
@@ -37,7 +36,6 @@ import dagger.Subcomponent;
DefaultComponentBinder.class,
DependencyProvider.class,
DependencyBinder.class,
OneHandedModule.class,
PipModule.class,
SystemServicesModule.class,
SystemUIBinder.class,

8
packages/SystemUI/src/com/android/systemui/onehanded/OneHandedManagerImpl.java → packages/SystemUI/src/com/android/systemui/onehanded/OneHandedController.java
View File

@@ -49,7 +49,7 @@ import javax.inject.Inject;
* Manages and manipulates the one handed states, transitions, and gesture for phones.
*/
@SysUISingleton
public class OneHandedManagerImpl implements OneHandedManager, Dumpable {
public class OneHandedController implements Dumpable {
private static final String TAG = "OneHandedManager";
private static final String ONE_HANDED_MODE_OFFSET_PERCENTAGE =
"persist.debug.one_handed_offset_percentage";
@@ -106,7 +106,7 @@ public class OneHandedManagerImpl implements OneHandedManager, Dumpable {
* Constructor of OneHandedManager
*/
@Inject
public OneHandedManagerImpl(Context context,
public OneHandedController(Context context,
CommandQueue commandQueue,
DisplayController displayController,
NavigationModeController navigationModeController,
@@ -137,7 +137,7 @@ public class OneHandedManagerImpl implements OneHandedManager, Dumpable {
*/
// TODO(b/161980408): Should remove extra constructor.
@VisibleForTesting
OneHandedManagerImpl(Context context,
OneHandedController(Context context,
CommandQueue commandQueue,
DisplayController displayController,
OneHandedDisplayAreaOrganizer displayAreaOrganizer,
@@ -194,7 +194,6 @@ public class OneHandedManagerImpl implements OneHandedManager, Dumpable {
/**
* Enters one handed mode.
*/
@Override
public void startOneHanded() {
if (!mDisplayAreaOrganizer.isInOneHanded()) {
final int yOffSet = Math.round(getDisplaySize().y * mOffSetFraction);
@@ -206,7 +205,6 @@ public class OneHandedManagerImpl implements OneHandedManager, Dumpable {
/**
* Exits one handed mode.
*/
@Override
public void stopOneHanded() {
if (mDisplayAreaOrganizer.isInOneHanded()) {
mDisplayAreaOrganizer.scheduleOffset(0, 0);

4
packages/SystemUI/src/com/android/systemui/onehanded/OneHandedGestureHandler.java
View File

@@ -103,7 +103,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback,
}
/**
* Notified by {@link OneHandedManager}, when user update settings of Enabled or Disabled
* Notified by {@link OneHandedController}, when user update settings of Enabled or Disabled
*
* @param isEnabled is one handed settings enabled or not
*/
@@ -264,7 +264,7 @@ public class OneHandedGestureHandler implements OneHandedTransitionCallback,
}
/**
* The touch(gesture) events to notify {@link OneHandedManager} start or stop one handed
* The touch(gesture) events to notify {@link OneHandedController} start or stop one handed
*/
public interface OneHandedGestureEventCallback {
/**

44
packages/SystemUI/src/com/android/systemui/onehanded/OneHandedManager.java
View File

@@ -1,44 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.onehanded;
/**
* The base class of OneHandedManager
*/
public interface OneHandedManager {
/**
* Set one handed enabled or disabled
*/
default void setOneHandedEnabled(boolean enabled) {}
/**
* Set task stack changed to exit
*/
default void setTaskChangeToExit(boolean enabled) {}
/**
* Exit one handed mode
*/
default void stopOneHanded() {}
/**
* Trigger one handed mode
*/
default void startOneHanded() {}
}

4
packages/SystemUI/src/com/android/systemui/onehanded/OneHandedTouchHandler.java
View File

@@ -63,7 +63,7 @@ public class OneHandedTouchHandler implements OneHandedTransitionCallback, Dumpa
}
/**
* Notified by {@link OneHandedManagerImpl}, when user update settings of Enabled or Disabled
* Notified by {@link OneHandedController}, when user update settings of Enabled or Disabled
*
* @param isEnabled is one handed settings enabled or not
*/
@@ -166,7 +166,7 @@ public class OneHandedTouchHandler implements OneHandedTransitionCallback, Dumpa
}
/**
* The touch(gesture) events to notify {@link OneHandedManager} start or stop one handed
* The touch(gesture) events to notify {@link OneHandedController} start or stop one handed
*/
public interface OneHandedTouchEventCallback {
/**

34
packages/SystemUI/src/com/android/systemui/onehanded/OneHandedUI.java
View File

@@ -59,7 +59,7 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
"com.android.internal.systemui.onehanded.gestural";
private static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
private final OneHandedManagerImpl mOneHandedManager;
private final OneHandedController mOneHandedController;
private final CommandQueue mCommandQueue;
private final Handler mMainHandler = new Handler(Looper.getMainLooper());
private final IOverlayManager mOverlayManager;
@@ -74,8 +74,8 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
OneHandedEvents.writeEvent(enabled
? OneHandedEvents.EVENT_ONE_HANDED_SETTINGS_ENABLED_ON
: OneHandedEvents.EVENT_ONE_HANDED_SETTINGS_ENABLED_OFF);
if (mOneHandedManager != null) {
mOneHandedManager.setOneHandedEnabled(enabled);
if (mOneHandedController != null) {
mOneHandedController.setOneHandedEnabled(enabled);
}
// Also checks swipe to notification settings since they all need gesture overlay.
@@ -125,8 +125,8 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
? OneHandedEvents.EVENT_ONE_HANDED_SETTINGS_APP_TAPS_EXIT_ON
: OneHandedEvents.EVENT_ONE_HANDED_SETTINGS_APP_TAPS_EXIT_OFF);
if (mOneHandedManager != null) {
mOneHandedManager.setTaskChangeToExit(enabled);
if (mOneHandedController != null) {
mOneHandedController.setTaskChangeToExit(enabled);
}
}
};
@@ -138,8 +138,8 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
final boolean enabled =
OneHandedSettingsUtil.getSettingsSwipeToNotificationEnabled(
mContext.getContentResolver());
if (mOneHandedManager != null) {
mOneHandedManager.setSwipeToNotificationEnabled(enabled);
if (mOneHandedController != null) {
mOneHandedController.setSwipeToNotificationEnabled(enabled);
}
// Also checks one handed mode settings since they all need gesture overlay.
@@ -152,14 +152,14 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
@Inject
public OneHandedUI(Context context,
CommandQueue commandQueue,
OneHandedManagerImpl oneHandedManager,
OneHandedController oneHandedController,
ScreenLifecycle screenLifecycle) {
super(context);
if (!SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
Log.i(TAG, "Device config SUPPORT_ONE_HANDED_MODE off");
mCommandQueue = null;
mOneHandedManager = null;
mOneHandedController = null;
mOverlayManager = null;
mTimeoutHandler = null;
mScreenLifecycle = null;
@@ -167,7 +167,7 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
}
mCommandQueue = commandQueue;
mOneHandedManager = oneHandedManager;
mOneHandedController = oneHandedController;
mTimeoutHandler = OneHandedTimeoutHandler.get();
mScreenLifecycle = screenLifecycle;
mOverlayManager = IOverlayManager.Stub.asInterface(
@@ -260,13 +260,13 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
}
private void updateSettings() {
mOneHandedManager.setOneHandedEnabled(OneHandedSettingsUtil
mOneHandedController.setOneHandedEnabled(OneHandedSettingsUtil
.getSettingsOneHandedModeEnabled(mContext.getContentResolver()));
mTimeoutHandler.setTimeout(OneHandedSettingsUtil
.getSettingsOneHandedModeTimeout(mContext.getContentResolver()));
mOneHandedManager.setTaskChangeToExit(OneHandedSettingsUtil
mOneHandedController.setTaskChangeToExit(OneHandedSettingsUtil
.getSettingsTapsAppToExit(mContext.getContentResolver()));
mOneHandedManager.setSwipeToNotificationEnabled(OneHandedSettingsUtil
mOneHandedController.setSwipeToNotificationEnabled(OneHandedSettingsUtil
.getSettingsSwipeToNotificationEnabled(mContext.getContentResolver()));
}
@@ -295,7 +295,7 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
* Trigger one handed more
*/
public void startOneHanded() {
mOneHandedManager.startOneHanded();
mOneHandedController.startOneHanded();
OneHandedEvents.writeEvent(OneHandedEvents.EVENT_ONE_HANDED_TRIGGER_GESTURE_IN);
}
@@ -303,7 +303,7 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
* Dismiss one handed more
*/
public void stopOneHanded() {
mOneHandedManager.stopOneHanded();
mOneHandedController.stopOneHanded();
OneHandedEvents.writeEvent(OneHandedEvents.EVENT_ONE_HANDED_TRIGGER_GESTURE_OUT);
}
@@ -314,8 +314,8 @@ public class OneHandedUI extends SystemUI implements CommandQueue.Callbacks, Dum
final String innerPrefix = " ";
pw.println(TAG + "one handed states: ");
if (mOneHandedManager != null) {
((OneHandedManagerImpl) mOneHandedManager).dump(fd, pw, args);
if (mOneHandedController != null) {
mOneHandedController.dump(fd, pw, args);
}
if (mTimeoutHandler != null) {

36
packages/SystemUI/src/com/android/systemui/onehanded/dagger/OneHandedModule.java
View File

@@ -1,36 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.systemui.onehanded.dagger;
import com.android.systemui.onehanded.OneHandedManager;
import com.android.systemui.onehanded.OneHandedManagerImpl;
import dagger.Binds;
import dagger.Module;
/**
* Dagger Module for One handed.
*/
@Module
public abstract class OneHandedModule {
/** Binds OneHandedManager as the default. */
@Binds
public abstract OneHandedManager provideOneHandedManager(
OneHandedManagerImpl oneHandedManagerImpl);
}

2
packages/SystemUI/src/com/android/systemui/tv/TvSysUIComponent.java
View File

@@ -24,7 +24,6 @@ import com.android.systemui.dagger.SysUISingleton;
import com.android.systemui.dagger.SystemServicesModule;
import com.android.systemui.dagger.SystemUIBinder;
import com.android.systemui.dagger.SystemUIModule;
import com.android.systemui.onehanded.dagger.OneHandedModule;
import dagger.Subcomponent;
@@ -36,7 +35,6 @@ import dagger.Subcomponent;
DefaultComponentBinder.class,
DependencyProvider.class,
DependencyBinder.class,
OneHandedModule.class,
SystemServicesModule.class,
SystemUIBinder.class,
SystemUIModule.class,

16
packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedManagerImplTest.java → packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedControllerTest.java
View File

@@ -46,9 +46,9 @@ import org.mockito.MockitoAnnotations;
@SmallTest
@RunWith(AndroidTestingRunner.class)
@TestableLooper.RunWithLooper
public class OneHandedManagerImplTest extends OneHandedTestCase {
public class OneHandedControllerTest extends OneHandedTestCase {
Display mDisplay;
OneHandedManagerImpl mOneHandedManagerImpl;
OneHandedController mOneHandedController;
OneHandedTimeoutHandler mTimeoutHandler;
@Mock
@@ -70,7 +70,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
mDisplay = mContext.getDisplay();
mOneHandedManagerImpl = new OneHandedManagerImpl(
mOneHandedController = new OneHandedController(
getContext(),
mCommandQueue,
mMockDisplayController,
@@ -102,7 +102,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
@Test
public void testStartOneHanded() {
mOneHandedManagerImpl.startOneHanded();
mOneHandedController.startOneHanded();
verify(mMockDisplayAreaOrganizer).scheduleOffset(anyInt(), anyInt());
}
@@ -110,7 +110,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
@Test
public void testStopOneHanded() {
when(mMockDisplayAreaOrganizer.isInOneHanded()).thenReturn(false);
mOneHandedManagerImpl.stopOneHanded();
mOneHandedController.stopOneHanded();
verify(mMockDisplayAreaOrganizer, never()).scheduleOffset(anyInt(), anyInt());
}
@@ -122,7 +122,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
@Test
public void testStopOneHanded_shouldRemoveTimer() {
mOneHandedManagerImpl.stopOneHanded();
mOneHandedController.stopOneHanded();
verify(mTimeoutHandler).removeTimer();
}
@@ -130,7 +130,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
@Test
public void testUpdateIsEnabled() {
final boolean enabled = true;
mOneHandedManagerImpl.setOneHandedEnabled(enabled);
mOneHandedController.setOneHandedEnabled(enabled);
verify(mMockTouchHandler, times(2)).onOneHandedEnabled(enabled);
}
@@ -138,7 +138,7 @@ public class OneHandedManagerImplTest extends OneHandedTestCase {
@Test
public void testUpdateSwipeToNotificationIsEnabled() {
final boolean enabled = true;
mOneHandedManagerImpl.setSwipeToNotificationEnabled(enabled);
mOneHandedController.setSwipeToNotificationEnabled(enabled);
verify(mMockTouchHandler, times(2)).onOneHandedEnabled(enabled);
}

14
packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedGestureHandlerTest.java
View File

@@ -30,8 +30,8 @@ import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
import com.android.systemui.model.SysUiState;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.statusbar.CommandQueue;
import com.android.wm.shell.common.DisplayController;
import org.junit.Before;
@@ -48,7 +48,7 @@ public class OneHandedGestureHandlerTest extends OneHandedTestCase {
OneHandedTouchHandler mTouchHandler;
OneHandedTutorialHandler mTutorialHandler;
OneHandedGestureHandler mGestureHandler;
OneHandedManagerImpl mOneHandedManagerImpl;
OneHandedController mOneHandedController;
@Mock
CommandQueue mCommandQueue;
@Mock
@@ -66,7 +66,7 @@ public class OneHandedGestureHandlerTest extends OneHandedTestCase {
mTutorialHandler = new OneHandedTutorialHandler(mContext);
mGestureHandler = Mockito.spy(new OneHandedGestureHandler(
mContext, mMockDisplayController, mMockNavigationModeController));
mOneHandedManagerImpl = new OneHandedManagerImpl(
mOneHandedController = new OneHandedController(
getContext(),
mCommandQueue,
mMockDisplayController,
@@ -93,15 +93,15 @@ public class OneHandedGestureHandlerTest extends OneHandedTestCase {
public void testReceiveNewConfig_whenSetOneHandedEnabled() {
// 1st called at init
verify(mGestureHandler).onOneHandedEnabled(true);
mOneHandedManagerImpl.setOneHandedEnabled(true);
mOneHandedController.setOneHandedEnabled(true);
// 2nd called by setOneHandedEnabled()
verify(mGestureHandler, times(2)).onOneHandedEnabled(true);
}
@Test
public void testOneHandedDisabled_shouldDisposeInputChannel() {
mOneHandedManagerImpl.setOneHandedEnabled(false);
mOneHandedManagerImpl.setSwipeToNotificationEnabled(false);
mOneHandedController.setOneHandedEnabled(false);
mOneHandedController.setSwipeToNotificationEnabled(false);
assertThat(mGestureHandler.mInputMonitor).isNull();
assertThat(mGestureHandler.mInputEventReceiver).isNull();
@@ -111,7 +111,7 @@ public class OneHandedGestureHandlerTest extends OneHandedTestCase {
public void testChangeNavBarTo2Button_shouldDisposeInputChannel() {
// 1st called at init
verify(mGestureHandler).onOneHandedEnabled(true);
mOneHandedManagerImpl.setOneHandedEnabled(true);
mOneHandedController.setOneHandedEnabled(true);
// 2nd called by setOneHandedEnabled()
verify(mGestureHandler, times(2)).onOneHandedEnabled(true);

12
packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedTouchHandlerTest.java
View File

@@ -28,8 +28,8 @@ import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
import com.android.systemui.model.SysUiState;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.statusbar.CommandQueue;
import com.android.wm.shell.common.DisplayController;
import org.junit.Before;
@@ -46,7 +46,7 @@ public class OneHandedTouchHandlerTest extends OneHandedTestCase {
OneHandedTouchHandler mTouchHandler;
OneHandedTutorialHandler mTutorialHandler;
OneHandedGestureHandler mGestureHandler;
OneHandedManagerImpl mOneHandedManagerImpl;
OneHandedController mOneHandedController;
@Mock
CommandQueue mCommandQueue;
@Mock
@@ -64,7 +64,7 @@ public class OneHandedTouchHandlerTest extends OneHandedTestCase {
mTouchHandler = Mockito.spy(new OneHandedTouchHandler());
mGestureHandler = new OneHandedGestureHandler(mContext, mMockDisplayController,
mMockNavigationModeController);
mOneHandedManagerImpl = new OneHandedManagerImpl(
mOneHandedController = new OneHandedController(
getContext(),
mCommandQueue,
mMockDisplayController,
@@ -88,14 +88,14 @@ public class OneHandedTouchHandlerTest extends OneHandedTestCase {
@Test
public void testOneHandedDisabled_shouldDisposeInputChannel() {
mOneHandedManagerImpl.setOneHandedEnabled(false);
mOneHandedController.setOneHandedEnabled(false);
assertThat(mTouchHandler.mInputMonitor).isNull();
assertThat(mTouchHandler.mInputEventReceiver).isNull();
}
@Test
public void testOneHandedEnabled_monitorInputChannel() {
mOneHandedManagerImpl.setOneHandedEnabled(true);
mOneHandedController.setOneHandedEnabled(true);
assertThat(mTouchHandler.mInputMonitor).isNotNull();
assertThat(mTouchHandler.mInputEventReceiver).isNotNull();
}
@@ -104,7 +104,7 @@ public class OneHandedTouchHandlerTest extends OneHandedTestCase {
public void testReceiveNewConfig_whenSetOneHandedEnabled() {
// 1st called at init
verify(mTouchHandler).onOneHandedEnabled(true);
mOneHandedManagerImpl.setOneHandedEnabled(true);
mOneHandedController.setOneHandedEnabled(true);
// 2nd called by setOneHandedEnabled()
verify(mTouchHandler, times(2)).onOneHandedEnabled(true);
}

6
packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedTutorialHandlerTest.java
View File

@@ -24,8 +24,8 @@ import android.testing.TestableLooper;
import androidx.test.filters.SmallTest;
import com.android.systemui.model.SysUiState;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.navigationbar.NavigationModeController;
import com.android.systemui.statusbar.CommandQueue;
import com.android.wm.shell.common.DisplayController;
import org.junit.Before;
@@ -42,7 +42,7 @@ public class OneHandedTutorialHandlerTest extends OneHandedTestCase {
OneHandedTouchHandler mTouchHandler;
OneHandedTutorialHandler mTutorialHandler;
OneHandedGestureHandler mGestureHandler;
OneHandedManagerImpl mOneHandedManagerImpl;
OneHandedController mOneHandedController;
@Mock
CommandQueue mCommandQueue;
@Mock
@@ -61,7 +61,7 @@ public class OneHandedTutorialHandlerTest extends OneHandedTestCase {
mTutorialHandler = Mockito.spy(new OneHandedTutorialHandler(mContext));
mGestureHandler = new OneHandedGestureHandler(mContext, mMockDisplayController,
mMockNavigationModeController);
mOneHandedManagerImpl = new OneHandedManagerImpl(
mOneHandedController = new OneHandedController(
getContext(),
mCommandQueue,
mMockDisplayController,

18
packages/SystemUI/tests/src/com/android/systemui/onehanded/OneHandedUITest.java
View File

@@ -48,7 +48,7 @@ public class OneHandedUITest extends OneHandedTestCase {
OneHandedUI mOneHandedUI;
ScreenLifecycle mScreenLifecycle;
@Mock
OneHandedManagerImpl mMockOneHandedManagerImpl;
OneHandedController mOneHandedController;
@Mock
OneHandedTimeoutHandler mMockTimeoutHandler;
@@ -59,7 +59,7 @@ public class OneHandedUITest extends OneHandedTestCase {
mScreenLifecycle = new ScreenLifecycle();
mOneHandedUI = new OneHandedUI(mContext,
mCommandQueue,
mMockOneHandedManagerImpl,
mOneHandedController,
mScreenLifecycle);
mOneHandedUI.start();
mKeyguardUpdateMonitor = mDependency.injectMockDependency(KeyguardUpdateMonitor.class);
@@ -74,14 +74,14 @@ public class OneHandedUITest extends OneHandedTestCase {
public void testStartOneHanded() {
mOneHandedUI.startOneHanded();
verify(mMockOneHandedManagerImpl).startOneHanded();
verify(mOneHandedController).startOneHanded();
}
@Test
public void testStopOneHanded() {
mOneHandedUI.stopOneHanded();
verify(mMockOneHandedManagerImpl).stopOneHanded();
verify(mOneHandedController).stopOneHanded();
}
@Test
@@ -89,7 +89,7 @@ public class OneHandedUITest extends OneHandedTestCase {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.TAPS_APP_TO_EXIT, 1);
verify(mMockOneHandedManagerImpl).setTaskChangeToExit(true);
verify(mOneHandedController).setTaskChangeToExit(true);
}
@Test
@@ -97,7 +97,7 @@ public class OneHandedUITest extends OneHandedTestCase {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ONE_HANDED_MODE_ENABLED, 1);
verify(mMockOneHandedManagerImpl).setOneHandedEnabled(true);
verify(mOneHandedController).setOneHandedEnabled(true);
}
@Test
@@ -115,7 +115,7 @@ public class OneHandedUITest extends OneHandedTestCase {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1);
verify(mMockOneHandedManagerImpl).setSwipeToNotificationEnabled(true);
verify(mOneHandedController).setSwipeToNotificationEnabled(true);
}
@Ignore("Clarifying do not receive callback")
@@ -123,14 +123,14 @@ public class OneHandedUITest extends OneHandedTestCase {
public void testKeyguardBouncerShowing_shouldStopOneHanded() {
mKeyguardUpdateMonitor.sendKeyguardBouncerChanged(true);
verify(mMockOneHandedManagerImpl).stopOneHanded();
verify(mOneHandedController).stopOneHanded();
}
@Test
public void testScreenTurningOff_shouldStopOneHanded() {
mScreenLifecycle.dispatchScreenTurningOff();
verify(mMockOneHandedManagerImpl).stopOneHanded();
verify(mOneHandedController).stopOneHanded();
}
}