Commit Graph

63039 Commits

Author SHA1 Message Date
tim peng
ef82018b68 Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03
Change-Id: Ida6ddf7e5635e9e9f578837dea209edfbc8151d6
2020-05-04 09:14:36 +00:00
Bonian Chen
be8eba0d3c [Settings] Crash avoidance am: 017cc4e48f am: 0f35750434
Change-Id: If14b3bcd1a908d9aa4f642cc0e2501140a244592
2020-05-04 09:14:28 +00:00
tim peng
8e81088c03 Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
Change-Id: I74eedc4056be20f794ad37962cc3ad2f7a1351fc
2020-05-04 09:02:38 +00:00
Bonian Chen
0f35750434 [Settings] Crash avoidance am: 017cc4e48f
Change-Id: Icc577b07a30bf31f5f745ebe4af2e526efb9ae6b
2020-05-04 09:02:12 +00:00
tim peng
1424b594c9 Merge "Modify rule of remote media session UI" into rvc-dev 2020-05-04 08:47:41 +00:00
Bonian Chen
017cc4e48f [Settings] Crash avoidance
Avoid crash when NullPointer.

Bug: 155248992
Test: manual
Change-Id: I5e4b46dcdf7ff21713b3f77fc9e20f503800b8e2
2020-05-04 14:11:09 +08:00
Tim Peng
e9b91f08c4 Modify rule of remote media session UI
-Add preference by remote session in Sound Setting
-Add slice item by remote session in Volume panel
-Replace media device data with media session data
-Add test case

Bug: 154918214
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib1c873c9f99eebcba377f4115c4b9b4297b20c3d
2020-05-04 12:21:20 +08:00
Automerger Merge Worker
50db25d330 Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp 2020-05-04 04:18:33 +00:00
Lucas Dupin
477f3aa0f9 Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2
Change-Id: Ibe8d53d3367f83fd6ea143d9ce85ced681b5d2f9
2020-05-04 04:18:28 +00:00
Lucas Dupin
d0e6d5421d Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d
Change-Id: I9cd6189b7386b4e0174911219b4fd31f1b8a2686
2020-05-04 04:18:17 +00:00
Lucas Dupin
8c568f2bc2 Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
Change-Id: I9114fa317a937a6dd39eee4383988aa5dead582e
2020-05-04 04:08:22 +00:00
Lucas Dupin
c716801a8d Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
Change-Id: I5d785681b2833ecbf6ae43234e5a09315a2a4232
2020-05-04 04:07:54 +00:00
Lucas Dupin
7dc7252c15 Merge "Create QS media player setting" into rvc-dev 2020-05-04 03:59:28 +00:00
TreeHugger Robot
0cdef9683d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7 -s ours
am skip reason: subject contains skip directive

Change-Id: I1c753b546fbb61ddbd993385839805b8d3e23385
2020-05-03 09:16:05 +00:00
TreeHugger Robot
1608a623b7 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-03 09:00:38 +00:00
TreeHugger Robot
8f0e6f5447 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c -s ours
am skip reason: subject contains skip directive

Change-Id: I0ee38a8eb03eab1ffb5e484c83f44e84e1d7770a
2020-05-03 08:36:26 +00:00
TreeHugger Robot
9bd365150c Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-03 08:23:22 +00:00
Bill Yi
ca4f8dfb98 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I4c63597e3993b679af42f096a8af9dc4dceea1c1
2020-05-02 19:12:05 -07:00
Bill Yi
651cc12908 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Iadf2ead728407f20fa5fead25b15bafb811d7f20
2020-05-02 18:40:13 -07:00
Bill Yi
4787a4e68f [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours am: 2dc933e7c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia0f63f14d86a36d2a5d24bc9759b605ca8f60240
2020-05-02 06:05:44 +00:00
Bill Yi
79720c1c93 [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours am: e20bd14430 -s ours
am skip reason: subject contains skip directive

Change-Id: I651b425bac2f88fa488ad63f0ef6f30eeb7575a5
2020-05-02 06:05:18 +00:00
Bill Yi
2dc933e7c5 [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours
am skip reason: subject contains skip directive

Change-Id: Iabc7ef84fd7cc24c9e2c0d7b9027a00bc2dd26d3
2020-05-02 05:50:25 +00:00
Bill Yi
e20bd14430 [automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a -s ours
am skip reason: subject contains skip directive

Change-Id: I1cd6c37cb420674e93b863d21a2b0062d7a355e4
2020-05-02 05:50:15 +00:00
Bill Yi
37c795af3a Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I76a7e3b5737e53869bee71cb8f8bbab9dbb40fc1
2020-05-01 18:03:30 -07:00
TreeHugger Robot
85ad7da38b Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25 am: 8c436c38cc
Change-Id: I0293bae9dfdcc6a54d9d02c55c93727ecd5b3273
2020-05-01 14:48:55 +00:00
TreeHugger Robot
6f59ebc18c Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25 am: 79fca6d0bd
Change-Id: Iebda1f0d1ff0cf800dddcb44fd7861ebba5341a1
2020-05-01 14:48:31 +00:00
TreeHugger Robot
8c436c38cc Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25
Change-Id: I698f07d6ced671cda19f3351d2a67bfb34d104f3
2020-05-01 14:37:20 +00:00
TreeHugger Robot
79fca6d0bd Merge "Center text even if string is long" into rvc-dev am: d2f16b4a25
Change-Id: I85c102e34db5c098eaff667b01848c7113416c2b
2020-05-01 14:37:04 +00:00
TreeHugger Robot
d2f16b4a25 Merge "Center text even if string is long" into rvc-dev 2020-05-01 14:20:23 +00:00
Arc Wang
bf0a4449a2 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 58989cd6ef
Change-Id: Icaf588e9776eb3b5d132d106aca71351e37f9e54
2020-05-01 13:43:26 +00:00
Arc Wang
ff739eb2aa Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420 am: 099685206b
Change-Id: I816467abc7caea295d29f3007c6bd5fd11c2d5d2
2020-05-01 13:43:12 +00:00
Arc Wang
58989cd6ef Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420
Change-Id: I476979d15356f25fdb3c76ee05721ee647ded7cc
2020-05-01 13:32:18 +00:00
Arc Wang
099685206b Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev am: 0a8c3b0420
Change-Id: Id2e7b98fe3e461119ab9a8e4573361f800a53328
2020-05-01 13:32:06 +00:00
Arc Wang
0a8c3b0420 Merge "Set usage graph LTR layout direction for Persian & Urdu" into rvc-dev 2020-05-01 13:16:08 +00:00
Alex Johnston
dfbec87e86 Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: f9e6cd001b
Change-Id: I491cf085523f62c8930473cc827e77f08a87727c
2020-05-01 10:45:26 +00:00
Alex Johnston
50639850ef Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581 am: d228e68e5d
Change-Id: I21441661c6b925fe68a13b321a75cf3c6e42730d
2020-05-01 10:45:09 +00:00
Alex Johnston
f9e6cd001b Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581
Change-Id: Ia2d0a042eb8161ef8e8f779fd70454a3e31b86e8
2020-05-01 10:31:04 +00:00
Alex Johnston
d228e68e5d Merge "Update work challenge header in Settings" into rvc-dev am: cf342c9581
Change-Id: Id61362adab4df33881d0eb7d9675cbf46c2236c6
2020-05-01 10:30:55 +00:00
Alex Johnston
cf342c9581 Merge "Update work challenge header in Settings" into rvc-dev 2020-05-01 10:10:49 +00:00
Arc Wang
0ff6a0a766 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 46a6ac052b
Change-Id: I27cadf1b27215c540d7865da297b9a4aff2bd456
2020-05-01 05:21:46 +00:00
Arc Wang
40eb2f6d21 Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d am: 9aff7f5d0f
Change-Id: Id62927c762c18569f1936bd9deb5d32b5058fa2f
2020-05-01 05:21:18 +00:00
Arc Wang
46a6ac052b Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
Change-Id: I9eda6563c28388f20c3acaf10d0d4569fccc7e7b
2020-05-01 05:06:30 +00:00
Arc Wang
9aff7f5d0f Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev am: 7e40584e5d
Change-Id: Id77ca934c98b189bb2634b17e53ff580025fe2bd
2020-05-01 05:06:19 +00:00
Arc Wang
7e40584e5d Merge "[Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases." into rvc-dev 2020-05-01 04:52:30 +00:00
govenliu
4d74ae2e67 [Wi-Fi] Enhance com.android.settings.wifi.p2p unit test cases.
Add new unit test cases in WifiP2pSettingsTest.java, the coverage rate will raise from 30% to 71%.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
Change-Id: I214866efae47a99e75178beca48deb398b70f9bd
2020-05-01 09:00:10 +08:00
Lucas Dupin
665c36eae2 Create QS media player setting
Test: make RunSettingsRoboTests ROBOTEST_FILTER=QuickSettingsMediaPlayerPreferenceControllerTest
Test: manual
Fixes: 155315021
Change-Id: I2583b985710898d0480f599fc9b5a2451c8950a7
2020-04-30 12:04:23 -07:00
Xiangyu/Malcolm Chen
9f07b1fcc2 [automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours am: 8e35cc2c37 -s ours
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2 is in history

Change-Id: Iee0e20457a4bb3bda387a4b09f968b9539e7ac73
2020-04-30 18:23:34 +00:00
Xiangyu/Malcolm Chen
8e35cc2c37 [automerger skipped] Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45 am: 30792ed811 -s ours
am skip reason: Change-Id I77dfa6eb61ee7b2cf2eb4fd8d8a392a43f7035b3 with SHA-1 08cc6396b2 is in history

Change-Id: I2104d827861e2a8f04f61de8d93b47429aac2efb
2020-04-30 18:04:26 +00:00
Xiangyu/Malcolm Chen
30792ed811 Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." am: 6819a64e45
Change-Id: I6e2235612a27168fc095773e0638da0c9602addd
2020-04-30 17:38:16 +00:00
Xiangyu/Malcolm Chen
6819a64e45 Merge "Fix Robo test failure in NrDisabledInDsdsFooterPreferenceControllerTest." 2020-04-30 17:16:55 +00:00