Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a37ebf65 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge "Turn off the open hub complication on the dream" into main

parents f38871c7 4a9e713d

packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java

+1 −4
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import androidx.annotation.Nullable; 
import com.android.internal.logging.UiEventLogger;

import com.android.settingslib.Utils;

import com.android.systemui.CoreStartable;

import com.android.systemui.Flags;

import com.android.systemui.animation.ActivityTransitionAnimator;

import com.android.systemui.complication.dagger.DreamHomeControlsComplicationComponent;

import com.android.systemui.controls.ControlsServiceInfo;
@@ -137,9 +136,7 @@ public class DreamHomeControlsComplication implements Complication { 


        private void updateHomeControlsComplication() {

            mControlsComponent.getControlsListingController().ifPresent(c -> {

                final boolean replacedWithOpenHub =

                        Flags.glanceableHubShortcutButton() && mReplacedByOpenHub;

                if (isHomeControlsAvailable(c.getCurrentServices()) && !replacedWithOpenHub) {

                if (isHomeControlsAvailable(c.getCurrentServices())) {

                    mDreamOverlayStateController.addComplication(mComplication);

                } else {

                    mDreamOverlayStateController.removeComplication(mComplication);

packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java

+5 −6
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.widget.ImageView; 


import com.android.settingslib.Utils;

import com.android.systemui.CoreStartable;

import com.android.systemui.Flags;

import com.android.systemui.communal.domain.interactor.CommunalInteractor;

import com.android.systemui.communal.shared.model.CommunalScenes;

import com.android.systemui.complication.dagger.OpenHubComplicationComponent;
@@ -111,11 +110,11 @@ public class OpenHubComplication implements Complication { 


        private void updateOpenHubComplication() {

            // TODO(b/339667383): don't show the complication if glanceable hub is disabled

            if (Flags.glanceableHubShortcutButton()) {

                mDreamOverlayStateController.addComplication(mComplication);

            } else {

                mDreamOverlayStateController.removeComplication(mComplication);

            }

//            if (Flags.glanceableHubShortcutButton()) {

//                mDreamOverlayStateController.addComplication(mComplication);

//            } else {

//                mDreamOverlayStateController.removeComplication(mComplication);

//            }

        }

    }