Bonian Chen
166f2df0a3
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: 9d6ba23df3 am: 8c6cf27814 am: ed1610cd5c am: d080e1a003
...
Change-Id: Icc43b43e537150d482220b48bbfd64b38b6bb3bb
2020-05-04 10:02:34 +00:00
Automerger Merge Worker
8336185c7d
Merge "Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: d6fd13ecc0" into rvc-d1-dev-plus-aosp am: f147b66486 am: a514fba795 am: b877580618
...
Change-Id: I2d13d120404e8beb0fd1be8378a47a4881181143
2020-05-04 10:02:27 +00:00
Automerger Merge Worker
020826addb
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 6a6650a58b" into rvc-d1-dev-plus-aosp am: da4b69513d am: 6165098904 am: 61051a8e21
...
Change-Id: I89774e03ed4ca88824347ccd6ee28ee04f2c9f49
2020-05-04 10:02:13 +00:00
Automerger Merge Worker
a98ed95e38
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3 am: 693186aa5f
...
Change-Id: I6b34597842307e13fbdb649191999dc17a1363f7
2020-05-04 10:01:49 +00:00
Bonian Chen
58fba2ee5d
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106 am: 9835acb2e2 am: 66e2d57e49 am: fe42999d21
...
Change-Id: I7c9e72e1f37cd529db75423c95872a2e580cf1f0
2020-05-04 10:01:40 +00:00
Bonian Chen
4fb35aa209
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c am: 81cf99b2c8 am: da07873848
...
Change-Id: I64cbdbdc13368d2d6761650aa6737081c5888b27
2020-05-04 10:01:33 +00:00
Bonian Chen
d080e1a003
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: 9d6ba23df3 am: 8c6cf27814 am: ed1610cd5c
...
Change-Id: Ie5b2228caaa1760274bb61a44f560106ca888bf8
2020-05-04 09:40:49 +00:00
Automerger Merge Worker
b877580618
Merge "Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: d6fd13ecc0" into rvc-d1-dev-plus-aosp am: f147b66486 am: a514fba795
...
Change-Id: I4977bbf61f3a1117307d4af66f1322731cc5adb9
2020-05-04 09:40:42 +00:00
Automerger Merge Worker
61051a8e21
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 6a6650a58b" into rvc-d1-dev-plus-aosp am: da4b69513d am: 6165098904
...
Change-Id: I0e7f852a35be740de87cbc3c0c33e507c7602fe0
2020-05-04 09:40:24 +00:00
Automerger Merge Worker
693186aa5f
Merge "Merge "Modify rule of remote media session UI" into rvc-dev am: 1424b594c9 am: 8e81088c03" into rvc-d1-dev-plus-aosp am: 99b7c321f9 am: ad01553db3
...
Change-Id: Id9c15e44517cb7752c9e8509e7ac4fa4845efde6
2020-05-04 09:39:46 +00:00
Bonian Chen
fe42999d21
[Settings] Crash avoidance am: 017cc4e48f am: 2e5af24106 am: 9835acb2e2 am: 66e2d57e49
...
Change-Id: Ie7ae49d27d65b196b5a228da1455712c9548acef
2020-05-04 09:39:37 +00:00
Bonian Chen
da07873848
[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: be8eba0d3c am: 81cf99b2c8
...
Change-Id: I4add4e3cecf4bf593fd2337ada98e5070ee0660d
2020-05-04 09:39:19 +00:00
Bonian Chen
ed1610cd5c
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: 9d6ba23df3 am: 8c6cf27814
...
Change-Id: Iee35d8fc0b73c5068f791a5d161dc96438be4d56
2020-05-04 09:29:26 +00:00
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
Bonian Chen
8c6cf27814
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4 am: 9d6ba23df3
...
Change-Id: I6746831af96e9462fbbeb0843ca8c5b6b52aea21
2020-05-04 09:16:31 +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
9d6ba23df3
Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
...
Change-Id: Ie4645e45cb3318f2ae8882c2d98131994f0b7c87
2020-05-04 09:02:47 +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
5511f7f46e
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31 am: 41ccc9f201 am: 04b13aba65 am: 0f417e9d09
...
Change-Id: I4931f43865494fd3e0410e1c76669e9eb85be6ae
2020-05-04 05:11:59 +00:00
Automerger Merge Worker
97c9ea39ca
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330 am: da63c1a4cf am: c594be9bee
...
Change-Id: I9b52c7c4dbddd396f3001b159854251e0bf100d3
2020-05-04 05:10:42 +00:00
Lucas Dupin
a1811f0c1c
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d am: f966f6449a am: ef6db613e2
...
Change-Id: I4fa1da1d5fa80645c8c4f869bd82e9708a05dfee
2020-05-04 05:10:23 +00:00
Lucas Dupin
0f417e9d09
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: e1bcfeed31 am: 41ccc9f201 am: 04b13aba65
...
Change-Id: I6451c58cf45128ae0509675ef09383273c759621
2020-05-04 04:52:58 +00:00
Automerger Merge Worker
c594be9bee
Merge "Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: 8c568f2bc2" into rvc-d1-dev-plus-aosp am: 50db25d330 am: da63c1a4cf
...
Change-Id: I779e1e36988a588c4fd60cae5beca6ed1f684099
2020-05-04 04:49:28 +00: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
Lucas Dupin
ef6db613e2
Merge "Create QS media player setting" into rvc-dev am: 7dc7252c15 am: c716801a8d am: d0e6d5421d am: f966f6449a
...
Change-Id: If04212840be902047e00bea9cb83ae3e399d07bf
2020-05-04 04:48:28 +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
