diff options
| author | Evan Laird <evanlaird@google.com> | 2021-06-25 14:29:03 -0400 |
|---|---|---|
| committer | Evan Laird <evanlaird@google.com> | 2021-07-01 15:02:00 +0000 |
| commit | 30a2c5b007f18036916ee8f153876b7df5f86a4d (patch) | |
| tree | 631463eb8106df2eaea40a58c1934d6c6ebca706 /packages/SystemUI/src/com/android/systemui/Dependency.java | |
| parent | 4eaca4eb9413eb35b7831414a4079910eb1824eb (diff) | |
Revert systemui status bar provider model behavior
This CL reverts the status bar provider model behavior. It removes the
logic to show only one icon at a time, and removes showing the call
strength indicators.
This change keeps the Internet tile, and decouples SystemUI from the
system setting SETTING_PROVIDER_MODEL.
Bug: 191903788
Test: atest SystemUITests SystemUIGoogleTests; manual
Test: test with a SIM and a Wi-Fi connection and there should be both
icons in the status bar and quick settings with this change. As
well as the Internet tile should stay (rather than going back to
the Cell and Wi-Fi tiles).
Change-Id: I017c10e4d7c1b15b152c44d092695dbc77e4a0ec
Merged-In: I017c10e4d7c1b15b152c44d092695dbc77e4a0ec
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/Dependency.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/Dependency.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java index 67cf4812ba6b..104d711f46fb 100644 --- a/packages/SystemUI/src/com/android/systemui/Dependency.java +++ b/packages/SystemUI/src/com/android/systemui/Dependency.java @@ -73,6 +73,7 @@ import com.android.systemui.shared.system.ActivityManagerWrapper; import com.android.systemui.shared.system.DevicePolicyManagerWrapper; import com.android.systemui.shared.system.PackageManagerWrapper; import com.android.systemui.statusbar.CommandQueue; +import com.android.systemui.statusbar.FeatureFlags; import com.android.systemui.statusbar.NotificationListener; import com.android.systemui.statusbar.NotificationLockscreenUserManager; import com.android.systemui.statusbar.NotificationMediaManager; @@ -360,6 +361,7 @@ public class Dependency { @Inject Lazy<PrivacyDotViewController> mPrivacyDotViewControllerLazy; @Inject Lazy<EdgeBackGestureHandler> mEdgeBackGestureHandler; @Inject Lazy<UiEventLogger> mUiEventLogger; + @Inject Lazy<FeatureFlags> mFeatureFlagsLazy; @Inject public Dependency() { @@ -574,6 +576,7 @@ public class Dependency { mProviders.put(PrivacyDotViewController.class, mPrivacyDotViewControllerLazy::get); mProviders.put(EdgeBackGestureHandler.class, mEdgeBackGestureHandler::get); mProviders.put(UiEventLogger.class, mUiEventLogger::get); + mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get); Dependency.setInstance(this); } |