Commit Graph

5260 Commits

Author SHA1 Message Date
Zoey Chen
4a8217abd9 Merge changes from topic "PSL_TelephonyCallback" am: 456069019e am: 0a1acbbcd3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b
2021-03-09 11:51:08 +00:00
Zoey Chen
809f500e0d [Telephony] Use TelephonyCallback instead of PhoneStateListener part1
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make
Change-Id: Ia3b777b12142b104b5798804f50b34748f9bf28c
Merged-In: Ia3b777b12142b104b5798804f50b34748f9bf28c
2021-03-08 20:25:00 +08:00
Beth Thibodeau
299eda8338 Merge "Limit maximum allowed size for a status bar icon" into rvc-qpr-dev am: 0ef492ff12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I601494506cc44aaf38950d4c4139aed38f59fdbd
2021-03-03 22:00:02 +00:00
Beth Thibodeau
0ef492ff12 Merge "Limit maximum allowed size for a status bar icon" into rvc-qpr-dev 2021-03-03 20:53:18 +00:00
Fabian Kozynski
75473c5d1e DO NOT MERGE Disable privacy indicators am: 2628cf48a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13554970

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3f805d3196fb64c76294177b127fa1e730a5111
2021-02-15 11:50:55 +00:00
Fabian Kozynski
2628cf48a1 DO NOT MERGE Disable privacy indicators
Test: manual
Fixes: 180018342
Change-Id: Ia5057e23a9974ef8ff3652c50adc0216844a7099
2021-02-11 21:00:27 +00:00
Beth Thibodeau
3a62e9ffaa Limit maximum allowed size for a status bar icon
Bug: 169255797
Test: atest StatusBarIconViewTest
Test: verified that app crashes instead of SysUI following repro steps
Change-Id: I66e3bb873841b5babfd522c82cea7bed361fc14c
(cherry picked from commit 4394595deb)
2021-01-28 21:59:12 +00:00
Evan Laird
4134ac8ade Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev am: 623049adac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13083016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad025254e0c1d8e3400ee9554594bc28d5b20b84
2021-01-12 20:12:54 +00:00
Evan Laird
623049adac Merge "Listen for EXTRA_PRESENT changes" into rvc-qpr-dev 2021-01-12 18:57:58 +00:00
Dave Mankoff
f6e1bd02b2 Merge "Unregister Touch Sensors for DOZE_AOD_DOCKED" into rvc-qpr-dev am: 263c0d5d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13230652

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I235e25b265a7ba55ab20e94edab4b44f2005683a
2021-01-11 19:54:03 +00:00
Dave Mankoff
263c0d5d5e Merge "Unregister Touch Sensors for DOZE_AOD_DOCKED" into rvc-qpr-dev 2021-01-11 19:07:36 +00:00
Beth Thibodeau
246bde6bf3 Merge "Use default color when artwork is too small" into rvc-qpr-dev am: 6ae71ece49
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13287026

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d139c24f7383d3cb6751ded3a7a78d91555ff89
2021-01-06 17:29:59 +00:00
Beth Thibodeau
7d5eb9543f Use default color when artwork is too small
Fixes: 175833333
Test: atest SystemUITests:MediaDataManagerTest
Change-Id: I12e0bd8c32f3f5f824f83312d4b3b3cf181fd486
(cherry picked from commit 8d15cc48fb)
2021-01-05 17:30:01 +00:00
Kyunglyul Hyun
b8709b7fc8 MediaRouterService binds services when necessary am: 56bc779553
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13224013

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I657a04858f8a7e0d181bb8bf667d00f6e311e178
2020-12-21 08:59:29 +00:00
Kyunglyul Hyun
56bc779553 MediaRouterService binds services when necessary
MediaRouterService maintained bindings to provider services
once those are established.

With this CL, it only binds services when there is a non-empty
discovery preference set by a foreground app or an app is casting.

This change may break output switcher, which enables transfer media
of background apps.

To alleviate that MediaRouter2Manager#startScan and #stopScan are added
so that system UI can force the service bind to the services and find
remote devices to cast.

Bug: 169575701
Bug: 172920557

Test: manually and CTS
Change-Id: I4a47fdb1c9fe05a04d26950485833c9cbfb91a69
(cherry picked from commit 9f889ca4e6)
(cherry picked from commit 602b168f99)
2020-12-21 00:34:16 +00:00
Dave Mankoff
3995f0db93 Unregister Touch Sensors for DOZE_AOD_DOCKED
DOZE_AOD_DOCKED should not have screen based trigger sensors
enabled. In fact, it can end up in inconsistent states currently.
When first entering it, the sensors are not enabled. But if the screen
then turns off (in a dark room) and then back on, the sensors are
left on from the prior state.

This change ensures that, when we ask to turn off touch based sensors,
they actually turn off.

Fixes: 172412931
Test: manual
Change-Id: I86f800cb75fee9f2d7e60655af4803e616a68fb2
Merged-In: I86f800cb75fee9f2d7e60655af4803e616a68fb2
2020-12-16 16:30:40 -05:00
Evan Laird
638ebb3254 Listen for EXTRA_PRESENT changes
ACTION_BATTERY_CHANGED can pass a boolean EXTRA_PRESENT which would
alert listeners that a battery may or may not be present. SystemUI now
wants to show an error battery state instead of a potentially misleading
status in this situation.

Bug: 169935148
Test: adb shell cmd battery set present 1
Change-Id: I7d576248bb9931059100facb67ca6b46e81e554e
Merged-In: I7d576248bb9931059100facb67ca6b46e81e554e
2020-12-11 16:05:37 -05:00
Robert Luo
616339c1d0 Migrate media output switcher metrics - 2/n
Bug: 172181610
Test: (1) run statsd_testdrive 277, and check the
metric output correctness after content switching.
(2) run statsd_testdrive 90, and check the metric
output correctness after launching the output dialog
via Sound Setting / Volume Rocker / Media Object Chip.
(3) atest MediaOutputControllerTest
(4) atest MediaOutputDialogTest
(5) atest MediaOutputBaseDialogTest

Change-Id: I0fea0c59afcb44fc1d22920036107524f221a7be
Merged-In: I0fea0c59afcb44fc1d22920036107524f221a7be
2020-12-10 11:06:53 +08:00
Robert Luo
23ccad79a7 Migrate media output switcher metrics - 1/n
Bug: 172181610
Test: (1) run statsd_testdrive 277, and check the
metric output correctness after content switching.
(2) run statsd_testdrive 90, and check the metric
output correctness after launching the output dialog
via Sound Setting / Volume Rocker / Media Object Chip.
(3) atest MediaOutputControllerTest
(4) atest MediaOutputDialogTest
(5) atest MediaOutputBaseDialogTest

Change-Id: I4094a510b5483a456522da9d0d8a6eee1526f687
Merged-In: I0fea0c59afcb44fc1d22920036107524f221a7be
2020-12-09 15:40:52 +08:00
timhypeng
933a23c874 Add dynamic item in output switcher if it is available am: c3447450d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13118158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8645519a9c060c62d411522156648ad02303771
2020-12-08 06:31:10 +00:00
timhypeng
9d07cfff0b Fix NPE when notification icon is empty am: 083c989950
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13118157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9655067ea1343dbcab3e1410a171fae5df6ab4de
2020-12-08 06:31:03 +00:00
Hugh Chen
a06d339f91 Fix output switcher didn't show album art am: c2dd442973
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13118156

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c65d2bcaa7b2bf37f65a213d0bbf0e2c8c7a00f
2020-12-08 06:30:56 +00:00
timhypeng
c73db6328e Add dynamic group operation in output switcher am: 634abfaf9c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109615

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb3f5fa00bded0188853bd8c54a9677da6aa050b
2020-12-08 06:30:49 +00:00
timhypeng
cda6f5f37a Enhancement for group operation in output switcher am: 3de24ae2c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109614

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acd4e4b65253fe376103ec11b736099c93ab4e6
2020-12-08 06:30:42 +00:00
timhypeng
0e6dd319e9 Update OutputSwitcher from SettingsPanel to MediaOutputDialog in SystemUI am: 29ae958b76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109612

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id752aba25eaf1428dec5e8316e17a1cb1c3d7f20
2020-12-08 06:30:31 +00:00
timhypeng
66fed6fcc9 Add animation when switching output device am: 411e7a5b7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109610

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I700cb5a98db53b4028c3c5a930dfdc1f1298a399
2020-12-08 06:30:18 +00:00
timhypeng
b46ff37d8a Add "Stop" button for remote device am: 5fc4c2883d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109608

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I139a01e203546ec1bfcbc6077445a24779ae4fb1
2020-12-08 06:30:05 +00:00
timhypeng
04645b9997 Add Media Output Dialog for Output Switcher am: 3e5de04302
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109603

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec4be1ac2a277b556c26548e152f4a9b705e14a7
2020-12-08 06:29:28 +00:00
timhypeng
637e1d2513 Add controller for Media operation am: c23f9171ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109602

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e059153b87530412d1143a58a4a6791d3356944
2020-12-08 06:29:22 +00:00
timhypeng
df822dab5c Add MediaOutputAdapter for Media device list am: d04087aff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13109601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8714d906a5bc77fe55731ad61aeed7ceeb79f13a
2020-12-08 06:29:15 +00:00
tim peng
7de579f1ce Merge changes from topic "media_output_dialog" into rvc-qpr-dev
* changes:
  Apply animation for Media Ouput Switcher dialog
  Add dynamic item in output switcher if it is available
  Fix NPE when notification icon is empty
  Fix output switcher didn't show album art
  Add dynamic group operation in output switcher
  Enhancement for group operation in output switcher
  Add dismiss timing for Media Output Dialog
  Update OutputSwitcher from SettingsPanel to MediaOutputDialog in SystemUI
  Add constant for dismiss Settings panel
  Add animation when switching output device
  Add dismiss intent and method for MediaOutputDialog
  Add "Stop" button for remote device
  Add constant for dialog dismiss
  Rename MediaOutDialogReceiver to MediaOutputDialogReceiver
  Add getFeatures() for get device supporting features
  Add a receiver to launch Output Switcher dialog
  Add MediaOutputDialogFactory to create MediaOutputDialog
  Add Media Output Dialog for Output Switcher
  Add controller for Media operation
  Add MediaOutputAdapter for Media device list
  Define strings for output switcher dialog in SystemUI
  Add image utility methods
2020-12-08 05:46:13 +00:00
Wesley.CW Wang
363cb09c7d Make AOD battery text field support BatteryDefender am: 30f92a367d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13090497

Change-Id: I1a8d82200b1dfccbf36adab91450cf7245df6c02
2020-12-07 18:47:26 +00:00
Wesley.CW Wang
30f92a367d Make AOD battery text field support BatteryDefender
- Add overheat flag into BatteryStatus
 - Update AOD battery indication to support new state when BatteryDefender is enable
 Screenshot: https://screenshot.googleplex.com/BYyUYS7VGtyG3i7.png

Bug: 173080412
Test: atest SystemUITests:com.android.systemui.statusbar.KeyguardIndicationControllerTest
Merged-In: I74f32136ba034d2dea19f71e1e7cecc022cd9fa9
Change-Id: I9aee4e6408d762639818e7aac42a781f12cd69ff
2020-12-07 18:31:30 +00:00
timhypeng
c3447450d4 Add dynamic item in output switcher if it is available
-Add extra item for dynamic group if getSelectedMediaDevice() > 1
-Move common method to base class

Bug: 171455839
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Merged-In: I5990df864cb7c5795e2d1a1cd404807d265b4cc3
Change-Id: I5990df864cb7c5795e2d1a1cd404807d265b4cc3
2020-12-02 03:30:33 +00:00
timhypeng
083c989950 Fix NPE when notification icon is empty
-Check notification icon before using

Bug: 162998388
Test: atest MediaOutputControllerTest
Merged-In: Ie3db32f3e6387f338c77faa741b2df54473a3675
Change-Id: Ie3db32f3e6387f338c77faa741b2df54473a3675
2020-12-02 03:30:22 +00:00
Hugh Chen
c2dd442973 Fix output switcher didn't show album art
Before this CL, output switcher will show application
icon when the meta data is null.

In this CL, output switcher will align the behavior of
the media object. If the meta data doesn’t have an album
art, then create it based on notification icon.

Bug: 162998388
Test: atest MediaOutputControllerTest
Merged-In: I761d83af8e08a744e4cd5c55ff2c445125885730
Change-Id: I761d83af8e08a744e4cd5c55ff2c445125885730
2020-12-02 03:30:07 +00:00
timhypeng
634abfaf9c Add dynamic group operation in output switcher
-Add MediaOutputGroupAdapter for device view layout
-Add MediaOutputGroupDialog for dialog header and buttom
-Add test cases

Bug: 155822415
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest MediaOutputGroupAdapterTest MediaOutputGroupDialogTest
Merged-In: I82b52485229b7aa8b80a6ef13fc9aac14af87446
Change-Id: I82b52485229b7aa8b80a6ef13fc9aac14af87446
2020-12-02 03:29:59 +00:00
timhypeng
3de24ae2c5 Enhancement for group operation in output switcher
-Add new group components in xml layout and assets
-Adjust view objects in adapter for new layout
-Add aboveStatusbar in MediaOutputControllter to keep the dialog style
when switching
-Add getGroupMediaDevices() in MediaOutputController to provide available
device list for group operation
-Update test cases

Bug: 155822415
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest
Merged-In: If74bf2efb89a8ece61f4e0cf13e4dcfa30cb0a8a
Change-Id: If74bf2efb89a8ece61f4e0cf13e4dcfa30cb0a8a
2020-12-02 03:29:52 +00:00
timhypeng
29ae958b76 Update OutputSwitcher from SettingsPanel to MediaOutputDialog in SystemUI
-Put MediaOutputDialogFactory in Dependency provider
-Inject MediaOutputDialogFactory in MediaControlPanel
-Use Dependency.get() to get MediaOutputDialogFactory in MediaTransferManager
-Use MediaOutputDialogFactory.create() to launch dialog in MediaControlPanel and MediaTransferManager

Bug: 155822415
Test: atest MediaControlPanelTest DependencyTest
Merged-In: I1b393d43bf4c7c869a3066404c9755ebef5f9c76
Change-Id: I1b393d43bf4c7c869a3066404c9755ebef5f9c76
2020-12-02 03:29:37 +00:00
timhypeng
411e7a5b7c Add animation when switching output device
Bug: 155822415
Test: manual test
Merged-In: Ia3370222427b77099d987d59d5d5fd08c11557d7
Change-Id: Ia3370222427b77099d987d59d5d5fd08c11557d7
2020-12-02 03:29:22 +00:00
timhypeng
5fc4c2883d Add "Stop" button for remote device
-Add "Stop" to stop remote media session
-Refine UI layout
1. Adjust size of head icon and apply defined dimen value
2. Move list padding inside the list to prevent truncating the list
3. Remove group-related view(I will add it in recycle view when the group feature is ready.)
-Add MediaOutputDialogTest
-Rename PAIR_NEW to CUSTOMIZED_ITEM_PAIR_NEW
-Integrate more UI view in setTwoLineLayout()

Bug: 155822415
Test: atest MediaOutputAdapterTest MediaOutputBaseDialogTest MediaOutputControllerTest MediaOutputDialogTest
Merged-In: Ie6a917c56a0ef97f772a8f43742afd2ee61e407f
Change-Id: Ie6a917c56a0ef97f772a8f43742afd2ee61e407f
2020-12-02 03:29:07 +00:00
timhypeng
3e5de04302 Add Media Output Dialog for Output Switcher
-Add MediaOutputBaseDialog to provide common method for different media operations UI
-Add MediaOutputDialog for showing Bluetooth device
-Add resources for background image, style and layout
-Add MediaOutputBaseDialogTest for unit test

Bug: 155822415
Test: atest MediaOutputBaseDialogTest
Merged-In: I3086a4049f240870ca1ad870946d6848e500b561
Change-Id: I3086a4049f240870ca1ad870946d6848e500b561
2020-12-02 03:23:47 +00:00
timhypeng
c23f9171ce Add controller for Media operation
-Access LocalMediaManger to display avilable output devices information
-Access LocalMediaManger to do media operation, such as volume adjustment,
switching output device, grouping
-Access MediaController to show media content information
-Add MediaOutputControllerTest for unit test

Bug: 155822415
Test: atest MediaOutputControllerTest
Merged-In: I9eb6e3b0a6e584637aecb4132dbc2b138c6d1530
Change-Id: I9eb6e3b0a6e584637aecb4132dbc2b138c6d1530
2020-12-02 03:21:14 +00:00
timhypeng
d04087aff3 Add MediaOutputAdapter for Media device list
-Build device item layout by different cases
-Provide UI component for different operations
-Add MediaOutputBaseAdapter for common method
-Add MediaOutputAdapterTest for unit test

Bug: 155822415
Test: atest MediaOutputAdapterTest
Merged-In: Ida509ed401320b3665d7a5f29f4df5db096ff29c
Change-Id: Ida509ed401320b3665d7a5f29f4df5db096ff29c
2020-12-02 03:20:51 +00:00
Sarah Chin
a9224e55b8 Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am: b6d1f47cf9 am: 4319ed36db am: 22575e2c57
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504955

Change-Id: Ie026572b55906384cb6f71c5947180c788eb5f64
2020-11-19 23:46:55 +00:00
Sarah Chin
67b50363b4 Expose CDMA ERI API am: 1b48e894c5 am: bc0ff8946f am: d33a6e1615
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504953

Change-Id: I866acc633c1f3479038dc93826749e71b0a78b32
2020-11-19 23:46:44 +00:00
Sarah Chin
22575e2c57 Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber" am: b6d1f47cf9 am: 4319ed36db
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504955

Change-Id: Ice760edde5d07a3c7cb43cff4abc5bd5432a8dd4
2020-11-19 23:28:09 +00:00
Sarah Chin
d33a6e1615 Expose CDMA ERI API am: 1b48e894c5 am: bc0ff8946f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1504953

Change-Id: I650512d17502e53b3aaf59f0faaf414e1ffa68cf
2020-11-19 23:28:03 +00:00
Sarah Chin
c6481cce40 Replace IconIndex as DisplayNumber
Test: atest TelephonyManagerTest
Fix: 171770692
Change-Id: I256649ad0ddcada29e4a7012de3e5889348adb17
Merged-In: I256649ad0ddcada29e4a7012de3e5889348adb17
2020-11-19 02:02:04 -08:00
Sarah Chin
1b48e894c5 Expose CDMA ERI API
Also remove CdmaEriInformation class, since it's not necessary to expose
the entire class.

Test: atest TelephonyManagerTest
Bug: 170421676
Change-Id: I810a492330e82f47949826a4b127164a5b950702
Merged-In: I810a492330e82f47949826a4b127164a5b950702
2020-11-19 01:54:57 -08:00