diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java | 5 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java | 11 |
2 files changed, 6 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java index e284bc7752cf..92108e9e7103 100644 --- a/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java b/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java index a679bfb15476..05df2bb4aa59 100644 --- a/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java @@ -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); +// } } } |