Commit 428451c3 authored 10 months ago by William Xiao Committed by Android (Google) Code Review 10 months ago

Merge changes from topic "b/339667383-dream-bottom-right" into main

* changes:
  Add lock screen shortcut for opening glanceable hub
  Add bottom right chip to dream overlay to show glanceable hub

parents 3332d8ba 69d74b4e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/aconfig/systemui.aconfig 7 additions, 0 deletions

packages/SystemUI/aconfig/systemui.aconfig
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt 1 addition, 0 deletions

...ordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt 3 additions, 1 deletion

...e/KeyguardQuickAffordanceLocalUserSelectionManagerTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/repository/KeyguardQuickAffordanceRepositoryTest.kt 2 additions, 1 deletion

.../data/repository/KeyguardQuickAffordanceRepositoryTest.kt
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt 1 addition, 0 deletions

...omain/interactor/KeyguardQuickAffordanceInteractorTest.kt
packages/SystemUI/res/drawable/ic_widgets.xml 27 additions, 0 deletions

packages/SystemUI/res/drawable/ic_widgets.xml
packages/SystemUI/res/layout/dream_overlay_open_hub_chip.xml 26 additions, 0 deletions

packages/SystemUI/res/layout/dream_overlay_open_hub_chip.xml
packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java 9 additions, 2 deletions

.../systemui/complication/DreamHomeControlsComplication.java
packages/SystemUI/src/com/android/systemui/complication/OpenHubComplication.java 212 additions, 0 deletions

...om/android/systemui/complication/OpenHubComplication.java
packages/SystemUI/src/com/android/systemui/complication/dagger/OpenHubComplicationComponent.java 138 additions, 0 deletions

...mui/complication/dagger/OpenHubComplicationComponent.java
packages/SystemUI/src/com/android/systemui/complication/dagger/RegisteredComplicationsModule.java 34 additions, 0 deletions

...ui/complication/dagger/RegisteredComplicationsModule.java
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt 2 additions, 0 deletions

...ata/quickaffordance/BuiltInKeyguardQuickAffordanceKeys.kt
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/GlanceableHubQuickAffordanceConfig.kt 61 additions, 0 deletions

...ata/quickaffordance/GlanceableHubQuickAffordanceConfig.kt
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardDataQuickAffordanceModule.kt 2 additions, 0 deletions

...data/quickaffordance/KeyguardDataQuickAffordanceModule.kt
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLocalUserSelectionManager.kt 20 additions, 1 deletion

...dance/KeyguardQuickAffordanceLocalUserSelectionManager.kt
packages/SystemUI/tests/src/com/android/systemui/complication/DreamHomeControlsComplicationTest.java 6 additions, 6 deletions

...temui/complication/DreamHomeControlsComplicationTest.java
packages/SystemUI/tests/src/com/android/systemui/keyguard/CustomizationProviderTest.kt 1 addition, 0 deletions

...om/android/systemui/keyguard/CustomizationProviderTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt 1 addition, 0 deletions

...tor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt 1 addition, 0 deletions

...or/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt 1 addition, 0 deletions

.../keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt

with 555 additions and 11 deletions

Please register or to comment