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

Merge "Remove Dependency.get(MAIN_HANDLER) from NavigationBarFragment"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-20 18:11:05 +00:00
committed by Android (Google) Code Review
parent 56e2bd284f ea1953c7c4
commit 2cb49a0f76
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarFragment.java
View File

@@ -89,11 +89,11 @@ import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.LatencyTracker;
import com.android.internal.view.AppearanceRegion;
import com.android.systemui.Dependency;
import com.android.systemui.R;
import com.android.systemui.assist.AssistHandleViewController;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.broadcast.BroadcastDispatcher;
import com.android.systemui.dagger.qualifiers.MainHandler;
import com.android.systemui.fragments.FragmentHostManager;
import com.android.systemui.fragments.FragmentHostManager.FragmentListener;
import com.android.systemui.model.SysUiState;
@@ -196,7 +196,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
@Nullable
private AssistHandleViewController mAssistHandlerViewController;
private Handler mHandler = Dependency.get(Dependency.MAIN_HANDLER);
private final Handler mHandler;
private final OverviewProxyListener mOverviewProxyListener = new OverviewProxyListener() {
@Override
@@ -271,7 +271,8 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
SysUiState sysUiFlagsContainer,
BroadcastDispatcher broadcastDispatcher,
CommandQueue commandQueue, Divider divider,
Optional<Recents> recentsOptional, Lazy<StatusBar> statusBarLazy) {
Optional<Recents> recentsOptional, Lazy<StatusBar> statusBarLazy,
@MainHandler Handler mainHandler) {
mAccessibilityManagerWrapper = accessibilityManagerWrapper;
mDeviceProvisionedController = deviceProvisionedController;
mStatusBarStateController = statusBarStateController;
@@ -287,6 +288,7 @@ public class NavigationBarFragment extends LifecycleFragment implements Callback
mCommandQueue = commandQueue;
mDivider = divider;
mRecentsOptional = recentsOptional;
mHandler = mainHandler;
}
// ----- Fragment Lifecycle Callbacks -----

3
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java
View File

@@ -253,7 +253,8 @@ public class NavigationBarFragmentTest extends SysuiBaseFragmentTest {
mCommandQueue,
mDivider,
Optional.of(mRecents),
() -> mock(StatusBar.class));
() -> mock(StatusBar.class),
mHandler);
}
private class HostCallbacksForExternalDisplay extends