From 07b572188310d53e38771aca80614a04f457c22a Mon Sep 17 00:00:00 2001 From: Alec Mouri Date: Wed, 17 Feb 2021 00:18:55 +0000 Subject: [PATCH] Revert "Add injection to ClockProvider." Revert submission 13536242-b179775696-depenency-get-keyguard Reason for revert: Candidate reversion for broken tests: b/180440298 Reverted Changes: I6d0271692:Add ViewController to CarrierText. I4d9a4a21f:Add Controller for Emergency Button. I4c76d99f9:Remove Dependency.get from KeyguardSliceTextView. I730593fcf:Add injection to ClockProvider. Ifbb93e624:Remove Dependency.get from KeyguardStatusView. I237215456:Remove final calls to Dependency.get from keyguard... Change-Id: I30a044a70ebcc785d3a7f69d80e7bf2129b20aa8 --- .../android/keyguard/clock/ClockModule.java | 33 ------------------- .../keyguard/clock/ClockOptionsProvider.java | 20 ++++++----- .../systemui/dagger/SysUIComponent.java | 6 ---- .../systemui/dagger/SystemUIModule.java | 2 -- 4 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 packages/SystemUI/src/com/android/keyguard/clock/ClockModule.java diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockModule.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockModule.java deleted file mode 100644 index c4be1ba535039..0000000000000 --- a/packages/SystemUI/src/com/android/keyguard/clock/ClockModule.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2021 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.keyguard.clock; - -import java.util.List; - -import dagger.Module; -import dagger.Provides; - -/** Dagger Module for clock package. */ -@Module -public abstract class ClockModule { - - /** */ - @Provides - public static List provideClockInfoList(ClockManager clockManager) { - return clockManager.getClockInfos(); - } -} diff --git a/packages/SystemUI/src/com/android/keyguard/clock/ClockOptionsProvider.java b/packages/SystemUI/src/com/android/keyguard/clock/ClockOptionsProvider.java index b6413cb61deb6..5ef35be8df51a 100644 --- a/packages/SystemUI/src/com/android/keyguard/clock/ClockOptionsProvider.java +++ b/packages/SystemUI/src/com/android/keyguard/clock/ClockOptionsProvider.java @@ -28,12 +28,11 @@ import android.text.TextUtils; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.Dependency; import java.io.FileNotFoundException; import java.util.List; - -import javax.inject.Inject; -import javax.inject.Provider; +import java.util.function.Supplier; /** * Exposes custom clock face options and provides realistic preview images. @@ -66,12 +65,15 @@ public final class ClockOptionsProvider extends ContentProvider { private static final String CONTENT_SCHEME = "content"; private static final String AUTHORITY = "com.android.keyguard.clock"; - @Inject - public Provider> mClockInfosProvider; + private final Supplier> mClocksSupplier; + + public ClockOptionsProvider() { + this(() -> Dependency.get(ClockManager.class).getClockInfos()); + } @VisibleForTesting - ClockOptionsProvider(Provider> clockInfosProvider) { - mClockInfosProvider = clockInfosProvider; + ClockOptionsProvider(Supplier> clocksSupplier) { + mClocksSupplier = clocksSupplier; } @Override @@ -97,7 +99,7 @@ public final class ClockOptionsProvider extends ContentProvider { } MatrixCursor cursor = new MatrixCursor(new String[] { COLUMN_NAME, COLUMN_TITLE, COLUMN_ID, COLUMN_THUMBNAIL, COLUMN_PREVIEW}); - List clocks = mClockInfosProvider.get(); + List clocks = mClocksSupplier.get(); for (int i = 0; i < clocks.size(); i++) { ClockInfo clock = clocks.get(i); cursor.newRow() @@ -137,7 +139,7 @@ public final class ClockOptionsProvider extends ContentProvider { throw new FileNotFoundException("Invalid preview url, missing id"); } ClockInfo clock = null; - List clocks = mClockInfosProvider.get(); + List clocks = mClocksSupplier.get(); for (int i = 0; i < clocks.size(); i++) { if (id.equals(clocks.get(i).getId())) { clock = clocks.get(i); diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java index 91c2dcfd92028..ffb8446f3e21a 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SysUIComponent.java @@ -16,7 +16,6 @@ package com.android.systemui.dagger; -import com.android.keyguard.clock.ClockOptionsProvider; import com.android.systemui.BootCompleteCacheImpl; import com.android.systemui.Dependency; import com.android.systemui.InitController; @@ -147,9 +146,4 @@ public interface SysUIComponent { * Member injection into the supplied argument. */ void inject(KeyguardSliceProvider keyguardSliceProvider); - - /** - * Member injection into the supplied argument. - */ - void inject(ClockOptionsProvider clockOptionsProvider); } diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index b67db03a743ca..b0067cd15c1ba 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -22,7 +22,6 @@ import android.content.Context; import androidx.annotation.Nullable; import com.android.internal.statusbar.IStatusBarService; -import com.android.keyguard.clock.ClockModule; import com.android.keyguard.dagger.KeyguardBouncerComponent; import com.android.systemui.BootCompleteCache; import com.android.systemui.BootCompleteCacheImpl; @@ -91,7 +90,6 @@ import dagger.Provides; @Module(includes = { AppOpsModule.class, AssistModule.class, - ClockModule.class, ControlsModule.class, DemoModeModule.class, FalsingModule.class,