Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

5ea095ca

Commit 5ea095ca authored 1 year ago by Jacqueline Bronger Committed by Android (Google) Code Review 1 year ago

Downloads
- Plain Diff

Merge "Adjust PhoneMediaDevice icons and (sub)titles (TV)" into main

parents 56fcc173 a40517dc

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

packages/SettingsLib/res/drawable/ic_hdmi.xml 26 additions, 0 deletions

packages/SettingsLib/res/drawable/ic_hdmi.xml
packages/SettingsLib/res/drawable/ic_tv.xml 26 additions, 0 deletions

packages/SettingsLib/res/drawable/ic_tv.xml
packages/SettingsLib/res/drawable/ic_usb.xml 26 additions, 0 deletions

packages/SettingsLib/res/drawable/ic_usb.xml
packages/SettingsLib/res/drawable/ic_wired_device.xml 25 additions, 0 deletions

packages/SettingsLib/res/drawable/ic_wired_device.xml
packages/SettingsLib/res/values/strings.xml 22 additions, 0 deletions

packages/SettingsLib/res/values/strings.xml
packages/SettingsLib/src/com/android/settingslib/media/DeviceIconUtil.java 29 additions, 16 deletions

...Lib/src/com/android/settingslib/media/DeviceIconUtil.java
packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java 96 additions, 3 deletions

...b/src/com/android/settingslib/media/PhoneMediaDevice.java
packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/DeviceIconUtilTest.java 227 additions, 49 deletions

...src/com/android/settingslib/media/DeviceIconUtilTest.java
packages/SystemUI/src/com/android/systemui/media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt 1 addition, 1 deletion

...media/muteawait/MediaMuteAwaitConnectionManagerFactory.kt

with 478 additions and 69 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