Bonian Chen
1afdc562db
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
...
Change-Id: I2bfd26b4715b9dc701649e8a86ff3ac7a7f6a36b
2020-04-08 05:23:36 +00:00
Bonian Chen
7322f57974
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
am: c034169ccd
-s ours am: 8ab7db3359
-s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
is in history
Change-Id: I5fa81c7b0fa93a4a60d7e1715e061d346df641ad
2020-04-08 05:21:57 +00:00
Bonian Chen
b1b0d9981a
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: a93ddbc42f
...
Change-Id: I420e7078ea39f8ea2a110c5156911a5f40497b2d
2020-04-08 05:21:43 +00:00
Bonian Chen
8ab7db3359
[automerger skipped] Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
am: c034169ccd
-s ours
...
am skip reason: Change-Id I0121f06efb5257dccc05ad06b93a9db263f012b5 with SHA-1 64ac0d4a74
is in history
Change-Id: Id59f155e4e5368d776b5103514bf4e6072438cd9
2020-04-08 05:21:24 +00:00
Bonian Chen
c034169ccd
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option." am: 4e8786c09b
...
Change-Id: I36f17b8206bd397306dca9d37e2bd3cf48700321
2020-04-08 05:08:49 +00:00
Bonian Chen
a93ddbc42f
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I793ec6eca3bab04122ebcd5e6a957d16fe14f5e0
2020-04-08 05:03:17 +00:00
Bonian Chen
403c8aa4ee
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
...
Change-Id: I59eea93d852d4397306099e14c202c795761a446
2020-04-08 05:03:08 +00:00
Bonian Chen
4e8786c09b
Merge "[Settings] "Data during calls" in DDS SUB is still in advanced option."
2020-04-08 04:57:12 +00:00
Bonian Chen
05cb60b258
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 04:52:23 +00:00
Bonian Chen
27ac6ed0a3
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
am: b35536dda8
-s ours am: 9be78b056f
-s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
is in history
Change-Id: Ibd37f124573e527a25454c13a0e6c29864265d3f
2020-04-08 04:12:03 +00:00
Bonian Chen
9be78b056f
[automerger skipped] Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
am: b35536dda8
-s ours
...
am skip reason: Change-Id I10aff50b6f3fc50b2f336ee320740f9f4a81e256 with SHA-1 bd03b17a62
is in history
Change-Id: I220736e2850a956d44d441270755d4edcce9757a
2020-04-08 03:54:23 +00:00
Bonian Chen
d0b5dd2d20
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
am: ca4d249fc9
...
Change-Id: Ic468123d204ddbc7040611c3bc9f1832fd24ce54
2020-04-08 03:50:44 +00:00
tim peng
a9fad2e73d
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
am: fa54aab4d1
...
Change-Id: Idfd1aaa2b7743467d5319519584e18641be20726
2020-04-08 03:50:39 +00:00
Automerger Merge Worker
4d4ff44795
Merge "Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
am: 9140b1d29f" into rvc-d1-dev-plus-aosp
2020-04-08 03:50:34 +00:00
Automerger Merge Worker
fed400e8bd
Merge "Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
am: 778317679a" into rvc-d1-dev-plus-aosp
2020-04-08 03:50:32 +00:00
Bonian Chen
501261e7d5
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
am: 9140b1d29f
...
Change-Id: If79b2451b402d526fe66eff2586e55b348e8e9e3
2020-04-08 03:50:32 +00:00
tim peng
7b739830f1
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
am: 778317679a
...
Change-Id: I58b14af188521fca8577388f5320c4f2957c884d
2020-04-08 03:50:29 +00:00
tim peng
91c389b9a2
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
am: 3ffe34a48b
...
Change-Id: I9dbde9d6bee32a137a41a7b39d16be0218f32df6
2020-04-08 03:50:27 +00:00
tim peng
38315ae8af
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
am: f8d7c09e36
...
Change-Id: Ie51e102e2db56157da8723de911d4fc33cac43ef
2020-04-08 03:50:13 +00:00
Bonian Chen
b35536dda8
Merge "[Settings] Changes for supporting replacing ImsManager" am: 449f76d55c
...
Change-Id: I3c8fb5dc82165f42e6bee5742cddc48d934684ed
2020-04-08 03:41:01 +00:00
Bonian Chen
ca4d249fc9
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
...
Change-Id: Id483c51c2eb4589c873a49ab8c77f9f6eaca12f7
2020-04-08 03:36:18 +00:00
tim peng
fa54aab4d1
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
...
Change-Id: Ia747117acf1a8d2e7a77049a013fb777e1ab64b9
2020-04-08 03:36:11 +00:00
Bonian Chen
9140b1d29f
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev am: bb9fbb60f0
...
Change-Id: I15184d9be4569bd195a7416cad256f4943d2ca9b
2020-04-08 03:36:09 +00:00
tim peng
778317679a
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
...
Change-Id: I5cd836d2390ad92e2c7a1afb7973186327bfc98b
2020-04-08 03:36:04 +00:00
tim peng
3ffe34a48b
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
...
Change-Id: I4a837f5a6e19c1df63ef45e4579710cc40afda9c
2020-04-08 03:36:02 +00:00
tim peng
f8d7c09e36
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
...
Change-Id: Ib06f81892b8176fd9084543d6d970e15a50ac51d
2020-04-08 03:35:54 +00:00
Bonian Chen
bb9fbb60f0
Merge "Merge "Catch crash in mobile network ProgressDialog" am: aaee4539c7
am: 840506e88a
am: 2d84cdbc3a
am: e6c57426cd
am: 7300bab2b6" into rvc-dev
2020-04-08 03:23:09 +00:00
Bonian Chen
449f76d55c
Merge "[Settings] Changes for supporting replacing ImsManager"
2020-04-08 03:20:43 +00:00
tim peng
e189ac522e
Merge "Settings crashed by a null worker" into rvc-dev
2020-04-08 03:18:31 +00:00
tim peng
f1f7b861d9
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev
2020-04-08 03:18:09 +00:00
Automerger Merge Worker
ad4601d0a9
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours" into rvc-d1-dev-plus-aosp
2020-04-08 01:07:29 +00:00
TreeHugger Robot
905df65efe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 0da8214ae4
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5b7d82d1a6e108b7b970e2b89b35c8ec590bfb59
2020-04-08 01:07:22 +00:00
TreeHugger Robot
7a21022523
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours am: 7b22b09804
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If9aca46f310a8538abf4121dd99efb543030febc
2020-04-08 01:07:19 +00:00
TreeHugger Robot
0da8214ae4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I542c75f8e37a04987fa74bc83ec6fc4c8c691a62
2020-04-08 00:50:33 +00:00
TreeHugger Robot
7b22b09804
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours am: f97c675cde
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I60a47c45f4494f7f5e3b396a7176bce00b2f5c31
2020-04-08 00:50:14 +00:00
Bill Yi
74281173a1
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours am: ca155cd26d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic8e71a27573248913f68efbff6bf7c334a587388
2020-04-08 00:38:47 +00:00
Bill Yi
d8796a70f3
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours am: 54f6c923d8
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I9d7f2e2dd675203842bc257d0f74ea0b62a871f3
2020-04-08 00:37:46 +00:00
TreeHugger Robot
f97c675cde
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 5064d96e3a
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I5197f84d818588ccb3e3686b32c5e0beb12c1463
2020-04-08 00:36:53 +00:00
Bill Yi
ca155cd26d
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8d41aea0cd7c0dd5bd637cf7f14c82ef4748f7c3
2020-04-08 00:24:56 +00:00
Bill Yi
54f6c923d8
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I6bcb1265f56308386c9b54e25b5b34be5b74e375
2020-04-08 00:24:54 +00:00
TreeHugger Robot
5064d96e3a
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-04-08 00:18:18 +00:00
TreeHugger Robot
3318cf0afa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours am: b9bf1df5cb
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ied3f780783fe51050c9f3895087ad5d051f757b3
2020-04-08 00:11:49 +00:00
TreeHugger Robot
d1eca425d4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours am: 5e4fb3f052
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie4ee1797164999b9df63db5bd00a601d3c45b40b
2020-04-08 00:11:36 +00:00
Menghan Li
7961890fb3
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 231b8ae707
...
Change-Id: I5052a8fa96cd9f455c3193b2d4435e52fb3afec9
2020-04-08 00:11:14 +00:00
Menghan Li
ed6d2ac408
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 48596c45a4
...
Change-Id: I98b38e3de8394e9b84d960b3a923aad6b7e47d2e
2020-04-08 00:11:00 +00:00
Bill Yi
2d031a2068
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Idc1bb3593dba2931cfe035fcca47b88a48767866
2020-04-08 00:10:43 +00:00
TreeHugger Robot
b9bf1df5cb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaa869049896bbb5fc23e52be0739779b1cc9affe
2020-04-07 23:50:25 +00:00
TreeHugger Robot
5e4fb3f052
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I471e8af6bba792d60cb5f52604be74773e5f91fe
2020-04-07 23:50:24 +00:00
Menghan Li
231b8ae707
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
...
Change-Id: Id8ee5d83613b1e8c22f757781799aa4a18bcae98
2020-04-07 23:50:16 +00:00
Menghan Li
48596c45a4
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
...
Change-Id: I7fed711f096a26a1020869c8a882f1186678d6ae
2020-04-07 23:50:13 +00:00