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

f0123b8a

Commit f0123b8a authored 4 years ago by TreeHugger Robot Committed by Automerger Merge Worker 4 years ago

Downloads
- Plain Diff

Merge "Controls - Handle launching/back from activities" into sc-dev am: 5d22e6ad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439537c2eb17f452e081883e648c6be1f589060f

parents e47357e2 5d22e6ad

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt 16 additions, 3 deletions

...d/systemui/controls/management/ControlsEditingActivity.kt
packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt 21 additions, 4 deletions

...ystemui/controls/management/ControlsFavoritingActivity.kt
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsDialog.kt 1 addition, 1 deletion

...UI/src/com/android/systemui/controls/ui/ControlsDialog.kt
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiController.kt 1 addition, 0 deletions

.../com/android/systemui/controls/ui/ControlsUiController.kt
packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt 4 additions, 0 deletions

.../android/systemui/controls/ui/ControlsUiControllerImpl.kt

with 43 additions and 8 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