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

053fd082

Commit 053fd082 authored 1 year ago by Treehugger Robot Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Don't show face messages if fp messages are showing" into main

parents d91903a2 8e989f9f

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/src/com/android/keyguard/KeyguardMessageAreaController.java 45 additions, 0 deletions

...c/com/android/keyguard/KeyguardMessageAreaController.java
packages/SystemUI/src/com/android/keyguard/logging/KeyguardLogger.kt 21 additions, 0 deletions

...stemUI/src/com/android/keyguard/logging/KeyguardLogger.kt
packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java 110 additions, 41 deletions

...roid/systemui/statusbar/KeyguardIndicationController.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java 4 additions, 3 deletions

...ystemui/statusbar/phone/StatusBarKeyguardViewManager.java
packages/SystemUI/tests/src/com/android/keyguard/KeyguardMessageAreaControllerTest.java 50 additions, 0 deletions

...m/android/keyguard/KeyguardMessageAreaControllerTest.java
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyguardIndicationControllerTest.java 71 additions, 3 deletions

.../systemui/statusbar/KeyguardIndicationControllerTest.java

with 301 additions and 47 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