Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_frameworks_base-old
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

21f91f5d

Commit 21f91f5d authored 1 year ago by Brad Hinegardner Committed by Automerger Merge Worker 1 year ago

Downloads
- Plain Diff

Merge "Align lockscreen state and picker state for Device Controls shortcut"...

Merge "Align lockscreen state and picker state for Device Controls shortcut" into udc-qpr-dev am: cb9ba144

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24852833

Change-Id: Ib8f1941ff641c75d076523b819f583eb5d05116d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ad1dbf15 cb9ba144

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/res/values/strings.xml 1 addition, 1 deletion

packages/SystemUI/res/values/strings.xml
packages/SystemUI/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt 3 additions, 2 deletions

...ckaffordance/HomeControlsKeyguardQuickAffordanceConfig.kt
packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/HomeControlsKeyguardQuickAffordanceConfigParameterizedStateTest.kt 1 addition, 1 deletion

...olsKeyguardQuickAffordanceConfigParameterizedStateTest.kt

with 5 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment