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

Remove Dependency.get usages from RemoteInputQuickSettingsDisabler

Browse Source 
Test: atest SystemUITests
Change-Id: I48268665e28cd0b2739a2f1eb8012e705c4868ea
This commit is contained in:
Jason Monk
2018-12-21 12:54:37 -05:00
parent 61936ee3d6
commit eeff95b1d7
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisabler.java
View File

@@ -21,7 +21,6 @@ import android.content.Context;
import android.content.res.Configuration;
import com.android.internal.annotations.VisibleForTesting;
import com.android.systemui.Dependency;
import com.android.systemui.SysUiServiceProvider;
import com.android.systemui.qs.QSFragment;
import com.android.systemui.statusbar.CommandQueue;
@@ -44,11 +43,12 @@ public class RemoteInputQuickSettingsDisabler
@VisibleForTesting CommandQueue mCommandQueue;
@Inject
public RemoteInputQuickSettingsDisabler(Context context) {
public RemoteInputQuickSettingsDisabler(Context context,
ConfigurationController configController) {
mContext = context;
mCommandQueue = SysUiServiceProvider.getComponent(context, CommandQueue.class);
mLastOrientation = mContext.getResources().getConfiguration().orientation;
Dependency.get(ConfigurationController.class).addCallback(this);
configController.addCallback(this);
}
public int adjustDisableFlags(int state) {

4
packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java
View File

@@ -38,6 +38,7 @@ import com.android.systemui.SystemUIFactory;
import com.android.systemui.SysuiBaseFragmentTest;
import com.android.systemui.statusbar.phone.StatusBarIconController;
import com.android.systemui.statusbar.policy.Clock;
import com.android.systemui.statusbar.policy.ConfigurationController;
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
import com.android.systemui.statusbar.policy.UserSwitcherController;
import com.android.systemui.util.InjectionInflationController;
@@ -124,7 +125,8 @@ public class QSFragmentTest extends SysuiBaseFragmentTest {
@Override
protected Fragment instantiate(Context context, String className, Bundle arguments) {
return new QSFragment(new RemoteInputQuickSettingsDisabler(context),
return new QSFragment(
new RemoteInputQuickSettingsDisabler(context, mock(ConfigurationController.class)),
new InjectionInflationController(SystemUIFactory.getInstance().getRootComponent()),
context);
}

4
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RemoteInputQuickSettingsDisablerTest.java
View File

@@ -29,6 +29,7 @@ import android.test.suitebuilder.annotation.SmallTest;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.statusbar.CommandQueue;
import com.android.systemui.statusbar.policy.ConfigurationController;
import org.junit.Before;
import org.junit.Test;
@@ -49,7 +50,8 @@ public class RemoteInputQuickSettingsDisablerTest extends SysuiTestCase {
mCommandQueue = mock(CommandQueue.class);
mContext.putComponent(CommandQueue.class, mCommandQueue);
mRemoteInputQuickSettingsDisabler = new RemoteInputQuickSettingsDisabler(mContext);
mRemoteInputQuickSettingsDisabler = new RemoteInputQuickSettingsDisabler(mContext,
mock(ConfigurationController.class));
}
@Test