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

Merge "Make Recents purely optional" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-19 16:37:18 +00:00
committed by Android (Google) Code Review
parent 0426c88c1f 59028ba189
commit 809db6c873
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/Dependency.java
View File

@@ -66,7 +66,6 @@ import com.android.systemui.power.PowerUI;
import com.android.systemui.privacy.PrivacyItemController;
import com.android.systemui.qs.ReduceBrightColorsController;
import com.android.systemui.recents.OverviewProxyService;
import com.android.systemui.recents.Recents;
import com.android.systemui.screenrecord.RecordingController;
import com.android.systemui.shared.plugins.PluginManager;
import com.android.systemui.shared.system.ActivityManagerWrapper;
@@ -361,7 +360,6 @@ public class Dependency {
@Inject Lazy<DozeParameters> mDozeParameters;
@Inject Lazy<IWallpaperManager> mWallpaperManager;
@Inject Lazy<CommandQueue> mCommandQueue;
@Inject Lazy<Recents> mRecents;
@Inject Lazy<RecordingController> mRecordingController;
@Inject Lazy<ProtoTracer> mProtoTracer;
@Inject Lazy<MediaOutputDialogFactory> mMediaOutputDialogFactory;
@@ -564,7 +562,6 @@ public class Dependency {
mProviders.put(DozeParameters.class, mDozeParameters::get);
mProviders.put(IWallpaperManager.class, mWallpaperManager::get);
mProviders.put(CommandQueue.class, mCommandQueue::get);
mProviders.put(Recents.class, mRecents::get);
mProviders.put(ProtoTracer.class, mProtoTracer::get);
mProviders.put(DeviceConfigProxy.class, mDeviceConfigProxy::get);
mProviders.put(TelephonyListenerManager.class, mTelephonyListenerManager::get);

8
packages/SystemUI/src/com/android/systemui/accessibility/SystemActions.java
View File

@@ -140,7 +140,7 @@ public class SystemActions extends SystemUI {
private static final String PERMISSION_SELF = "com.android.systemui.permission.SELF";
private final SystemActionsBroadcastReceiver mReceiver;
private final Recents mRecents;
private final Optional<Recents> mRecentsOptional;
private Locale mLocale;
private final AccessibilityManager mA11yManager;
private final Lazy<Optional<StatusBar>> mStatusBarOptionalLazy;
@@ -152,9 +152,9 @@ public class SystemActions extends SystemUI {
public SystemActions(Context context,
NotificationShadeWindowController notificationShadeController,
Lazy<Optional<StatusBar>> statusBarOptionalLazy,
Recents recents) {
Optional<Recents> recentsOptional) {
super(context);
mRecents = recents;
mRecentsOptional = recentsOptional;
mReceiver = new SystemActionsBroadcastReceiver();
mLocale = mContext.getResources().getConfiguration().getLocales().get(0);
mA11yManager = (AccessibilityManager) mContext.getSystemService(
@@ -370,7 +370,7 @@ public class SystemActions extends SystemUI {
}
private void handleRecents() {
mRecents.toggleRecentApps();
mRecentsOptional.ifPresent(Recents::toggleRecentApps);
}
private void handleNotifications() {

1
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
View File

@@ -611,6 +611,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
@Override
public void onViewAttachedToWindow(View v) {
final Display display = v.getDisplay();
mNavigationBarView.setComponents(mRecentsOptional);
mNavigationBarView.setComponents(mStatusBarOptionalLazy.get().get().getPanelController());
mNavigationBarView.setDisabledFlags(mDisabledFlags1);
mNavigationBarView.setOnVerticalChangedListener(this::onVerticalChanged);

8
packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java
View File

@@ -99,6 +99,7 @@ import com.android.wm.shell.pip.Pip;
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
public class NavigationBarView extends FrameLayout implements
@@ -166,6 +167,7 @@ public class NavigationBarView extends FrameLayout implements
private NavigationBarInflaterView mNavigationInflaterView;
private RecentsOnboarding mRecentsOnboarding;
private Optional<Recents> mRecentsOptional = Optional.empty();
private NotificationPanelViewController mPanelView;
private RotationContextButton mRotationContextButton;
private FloatingRotationButton mFloatingRotationButton;
@@ -254,7 +256,7 @@ public class NavigationBarView extends FrameLayout implements
@Override
public boolean performAccessibilityAction(View host, int action, Bundle args) {
if (action == R.id.action_toggle_overview) {
Dependency.get(Recents.class).toggleRecentApps();
mRecentsOptional.ifPresent(Recents::toggleRecentApps);
} else {
return super.performAccessibilityAction(host, action, args);
}
@@ -398,6 +400,10 @@ public class NavigationBarView extends FrameLayout implements
return mBarTransitions.getLightTransitionsController();
}
public void setComponents(Optional<Recents> recentsOptional) {
mRecentsOptional = recentsOptional;
}
public void setComponents(NotificationPanelViewController panel) {
mPanelView = panel;
updatePanelSystemUiStateFlags();