Commit 3397af24 authored 1 year ago by Brad Hinegardner Committed by Android (Google) Code Review 1 year ago

Merge "Move MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA and MIGRATE_LOCK_ICON flags to aconfig" into main

parents eff00e8c cf3e10c6

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/src/com/android/keyguard/LockIconViewController.java 2 additions, 1 deletion

...emUI/src/com/android/keyguard/LockIconViewController.java
packages/SystemUI/src/com/android/systemui/flags/Flags.kt 0 additions, 13 deletions

packages/SystemUI/src/com/android/systemui/flags/Flags.kt
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewConfigurator.kt 2 additions, 2 deletions

...com/android/systemui/keyguard/KeyguardViewConfigurator.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt 2 additions, 4 deletions

...stemui/keyguard/ui/binder/KeyguardIndicationAreaBinder.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt 2 additions, 1 deletion

...oid/systemui/keyguard/ui/binder/KeyguardRootViewBinder.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt 6 additions, 5 deletions

...d/systemui/keyguard/ui/preview/KeyguardPreviewRenderer.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AlignShortcutsToUdfpsSection.kt 3 additions, 5 deletions

...d/ui/view/layout/sections/AlignShortcutsToUdfpsSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultAmbientIndicationAreaSection.kt 3 additions, 5 deletions

...ew/layout/sections/DefaultAmbientIndicationAreaSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntryIconSection.kt 3 additions, 2 deletions

.../ui/view/layout/sections/DefaultDeviceEntryIconSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultIndicationAreaSection.kt 3 additions, 6 deletions

...d/ui/view/layout/sections/DefaultIndicationAreaSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultSettingsPopupMenuSection.kt 3 additions, 3 deletions

...i/view/layout/sections/DefaultSettingsPopupMenuSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultShortcutsSection.kt 3 additions, 3 deletions

...yguard/ui/view/layout/sections/DefaultShortcutsSection.kt
packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt 3 additions, 5 deletions

.../keyguard/ui/viewmodel/KeyguardIndicationAreaViewModel.kt
packages/SystemUI/src/com/android/systemui/scene/shared/flag/SceneContainerFlags.kt 5 additions, 2 deletions

...android/systemui/scene/shared/flag/SceneContainerFlags.kt
packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java 11 additions, 10 deletions

...droid/systemui/shade/NotificationPanelViewController.java
packages/SystemUI/tests/src/com/android/keyguard/LockIconViewControllerBaseTest.java 3 additions, 2 deletions

.../com/android/keyguard/LockIconViewControllerBaseTest.java
packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultDeviceEntryIconSectionTest.kt 7 additions, 4 deletions

...view/layout/sections/DefaultDeviceEntryIconSectionTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultIndicationAreaSectionTest.kt 3 additions, 7 deletions

.../view/layout/sections/DefaultIndicationAreaSectionTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardIndicationAreaViewModelTest.kt 0 additions, 5 deletions

...guard/ui/viewmodel/KeyguardIndicationAreaViewModelTest.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt 4 additions, 1 deletion

...iewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt

with 68 additions and 86 deletions

Please register or to comment