Automerger Merge Worker
a514fba795
Merge "Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
am: d6fd13ecc0" into rvc-d1-dev-plus-aosp am: f147b66486
...
Change-Id: I87f048a55172df0fcfebb952f2c34cad0a535752
2020-05-04 09:29:20 +00:00
Automerger Merge Worker
6165098904
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
am: 6a6650a58b" into rvc-d1-dev-plus-aosp am: da4b69513d
...
Change-Id: I62ef9a06421701eebc86a5b47be24f98f95f2cd3
2020-05-04 09:29:05 +00:00
Automerger Merge Worker
ad01553db3
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9
...
Change-Id: I1577ce02295337c512423cec6f4e94f42a16a19d
2020-05-04 09:28:45 +00:00
Bonian Chen
66e2d57e49
[Settings] Crash avoidance am: 017cc4e48f
am: 2e5af24106
am: 9835acb2e2
...
Change-Id: Id0aa191878c854d06f0bf6ccbfcf5afa0d406a6d
2020-05-04 09:28:30 +00:00
Bonian Chen
81cf99b2c8
[Settings] Crash avoidance am: 017cc4e48f
am: 0f35750434
am: be8eba0d3c
...
Change-Id: I4cf135f1f9441b23060ca692a67f99e12433018c
2020-05-04 09:28:15 +00:00
Automerger Merge Worker
f147b66486
Merge "Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
am: d6fd13ecc0" into rvc-d1-dev-plus-aosp
2020-05-04 09:15:02 +00:00
Bonian Chen
242dae37ce
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
am: d6fd13ecc0
...
Change-Id: I12a42c2af7414bd290b927095eda5769f81ca082
2020-05-04 09:14:58 +00:00
Automerger Merge Worker
da4b69513d
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
am: 6a6650a58b" into rvc-d1-dev-plus-aosp
2020-05-04 09:14:57 +00:00
Automerger Merge Worker
99b7c321f9
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
am: 8e81088c03" into rvc-d1-dev-plus-aosp
2020-05-04 09:14:47 +00:00
tim peng
b558e57ada
Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
am: 6a6650a58b
...
Change-Id: I3b094ebb0d24cd95020854104b8f06b7e5ef7a34
2020-05-04 09:14:44 +00:00
Bonian Chen
9835acb2e2
[Settings] Crash avoidance am: 017cc4e48f
am: 2e5af24106
...
Change-Id: I921c1a2c413f6a34c867da128840b799d14fd906
2020-05-04 09:14:37 +00:00
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
Bonian Chen
d6fd13ecc0
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
...
Change-Id: I6cd5d25fd4b59b440605f0609d923109ab8db89a
2020-05-04 09:02:47 +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
tim peng
6a6650a58b
Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9
...
Change-Id: I17fbe2aea7684a13f18dd47906a857daed5e8e72
2020-05-04 09:02:34 +00:00
Bonian Chen
2e5af24106
[Settings] Crash avoidance am: 017cc4e48f
...
Change-Id: I042c1b5332c18c780400e7ea47f70eb44b597cfc
2020-05-04 09:02:21 +00:00
Bonian Chen
0f35750434
[Settings] Crash avoidance am: 017cc4e48f
...
Change-Id: Icc577b07a30bf31f5f745ebe4af2e526efb9ae6b
2020-05-04 09:02:12 +00:00
Bonian Chen
07431066c4
Merge "[Settings] Code refactor for availability session" into rvc-dev
2020-05-04 08:49:21 +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
7ea8e7ef1e
[Settings] Code refactor for availability session
...
Code refactor for session design of availability status config.
Bug: 141833767
Test: manual
Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657
2020-05-04 14:35:23 +08: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
Lucas Dupin
04b13aba65
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
am: c716801a8d
am: e1bcfeed31
am: 41ccc9f201
...
Change-Id: Icda4bd5715bc2118aaf4d90cbccb358dd08f20c1
2020-05-04 04:48:49 +00:00
Automerger Merge Worker
da63c1a4cf
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330
...
Change-Id: I28201d5da5101b3c829b35fa408c9e900828687b
2020-05-04 04:35:01 +00:00
Lucas Dupin
41ccc9f201
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
am: c716801a8d
am: e1bcfeed31
...
Change-Id: Ic02ca7209c0c44f6f10e33ecc75020692cf99719
2020-05-04 04:34:19 +00:00
Lucas Dupin
f966f6449a
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
am: c716801a8d
am: d0e6d5421d
...
Change-Id: I6c3bbe1a377680d2b83557a1b838bc5452409fc6
2020-05-04 04:34:19 +00: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
Lucas Dupin
e1bcfeed31
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15
am: c716801a8d
...
Change-Id: Ic2c9038ed28a38bdbb18144358f40eb37d5b236b
2020-05-04 04:18:43 +00: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
86379c0760
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7
-s ours am: b2ff994477
-s ours am: 297f9b73b8
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib8422a93e401b344cc44008a5294662c7e5ea838
2020-05-03 09:51:23 +00:00
TreeHugger Robot
bd0733edb3
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7
-s ours am: 0cdef9683d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idf3db9c9002f2e1dff58b78b2306f6c5d60af3ca
2020-05-03 09:30:43 +00:00
TreeHugger Robot
297f9b73b8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 1608a623b7
-s ours am: b2ff994477
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8f75a012e0275c0823eb5e7de9a33bdf05d6e761
2020-05-03 09:30:30 +00:00
TreeHugger Robot
b2ff994477
[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: I4f235712e92d9d82c2ae8a57fb593149a4caf8a7
2020-05-03 09:16:12 +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
e53cf845d9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c
-s ours am: 2fe0bc5526
-s ours am: 4f72bfca53
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I06765e70f414bbdd9670d769fd873ea16597b90a
2020-05-03 09:02:06 +00:00
TreeHugger Robot
cf308b3a4c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c
-s ours am: 8f0e6f5447
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I29d546ab8c02d8c957fa08fe2145f52945521c9c
2020-05-03 09:01:19 +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
4f72bfca53
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 9bd365150c
-s ours am: 2fe0bc5526
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I90ee005150e292ee976c437237645b70892dc649
2020-05-03 08:49:28 +00:00
TreeHugger Robot
2fe0bc5526
[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: I85a96ced85f72bce27aebddc6ceebef012aaaf09
2020-05-03 08:36:57 +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
f721507a39
[automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a
-s ours am: e20bd14430
-s ours am: 169e568744
-s ours am: 325024f0db
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I87f21f13d02e980d9e1c8d11c2fb26d2ebaeaecc
2020-05-02 06:35:41 +00:00
Bill Yi
aec204be77
[automerger skipped] Import translations. DO NOT MERGE am: 37c795af3a
-s ours am: 2dc933e7c5
-s ours am: 4787a4e68f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib3ed8712fa9557a1f40c15b99fd3d227cda15370
2020-05-02 06:16:52 +00:00