TreeHugger Robot
aa204a81fb
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d am: 7883d6af66 am: 00573cf65e
...
Change-Id: Iad08d1f6312b9f71d40a9e5af0bded0111fafd22
2020-04-01 21:46:40 +00:00
TreeHugger Robot
a43e978ffb
Merge "Fix crash when trying to open app info page" into rvc-dev
2020-04-01 21:43:47 +00:00
Automerger Merge Worker
b76b161240
Merge "Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d am: 1f7f575d27" into rvc-d1-dev-plus-aosp
2020-04-01 21:29:43 +00:00
TreeHugger Robot
af55710a6a
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d am: 1f7f575d27
...
Change-Id: I470bda0c03011529f8e74696c9b7b76bb7b92962
2020-04-01 21:29:33 +00:00
TreeHugger Robot
00573cf65e
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d am: 7883d6af66
...
Change-Id: I24dfcda68b3ebed58afd065f644efd21170318f1
2020-04-01 21:29:28 +00:00
TreeHugger Robot
b0d18ad0d9
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d am: 1f7f575d27
...
Change-Id: Ifca2ac97085ae5eed1ccfde3a7ea130881fb2112
2020-04-01 21:28:24 +00:00
TreeHugger Robot
7883d6af66
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d
...
Change-Id: Ibdb294c1e340f71c29dbd94de7f872b0accd7e25
2020-04-01 21:09:51 +00:00
TreeHugger Robot
1f7f575d27
Merge "Some more a11y fixes" into rvc-dev am: c78ad2087d
...
Change-Id: Id523846322da44f305fe7996fdfa29b9f0a851aa
2020-04-01 21:08:56 +00:00
TreeHugger Robot
c78ad2087d
Merge "Some more a11y fixes" into rvc-dev
2020-04-01 20:38:29 +00:00
TreeHugger Robot
0a2c516e59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours am: 72e8df570a -s ours am: bb7e1e399b -s ours am: 51659a2783 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icaa2479731d27e8665dcfb758fd33d1fdd8329ba
2020-04-01 19:03:26 +00:00
Xiangyu/Malcolm Chen
241835cd81
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b am: 4cbeb02147 am: a64d4005ce am: 8dd22f0598
...
Change-Id: I2f64bb7d963cad04cbac7e2d58b74f42accc1f75
2020-04-01 19:03:15 +00:00
TreeHugger Robot
432dd97dce
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: 0949a64f97 -s ours am: fe873fffbb -s ours am: 6f00c78441 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id171dd9078e6685468a9039479ec25a8b6d95f00
2020-04-01 19:03:05 +00:00
Xiangyu/Malcolm Chen
448c89aea3
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: d4beb34e3d am: 06ff3f9777 am: 4bdfdbda61
...
Change-Id: Id4593abfbc8f98bde921b22a00c642ebb9e7776a
2020-04-01 19:02:45 +00:00
TreeHugger Robot
ef88488b5a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours am: 1f8a50cad8 -s ours am: 72ede74565 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3dd25aeb8b7ec9e879dbdc94e757bdbbb94fb1fe
2020-04-01 19:02:21 +00:00
TreeHugger Robot
51659a2783
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours am: 72e8df570a -s ours am: bb7e1e399b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Icebb719ad740fa43b7ab8f272e0c150722e0c52c
2020-04-01 19:02:19 +00:00
Xiangyu/Malcolm Chen
8dd22f0598
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b am: 4cbeb02147 am: a64d4005ce
...
Change-Id: I9f5e8ebe95d6daa689e4711addf013975593c0f7
2020-04-01 19:02:06 +00:00
Xiangyu/Malcolm Chen
489cec0e1d
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b am: e92894e5eb am: dc33eb7eda
...
Change-Id: I7381a28832a99a41f9546257faa44c964875bbb5
2020-04-01 19:01:58 +00:00
TreeHugger Robot
6f00c78441
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: 0949a64f97 -s ours am: fe873fffbb -s ours
...
am skip reason: subject contains skip directive
Change-Id: I34de5206ae3472d6b62caab684b33dacf55063c5
2020-04-01 18:46:17 +00:00
Xiangyu/Malcolm Chen
4bdfdbda61
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: d4beb34e3d am: 06ff3f9777
...
Change-Id: Ib96bb41294c8b52a9475d8b15a724a75f46db048
2020-04-01 18:46:11 +00:00
TreeHugger Robot
bb7e1e399b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours am: 72e8df570a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9083414b206ad0bd95161f6389dc15e56c9e935c
2020-04-01 18:45:59 +00:00
TreeHugger Robot
72ede74565
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours am: 1f8a50cad8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id47e1c117e05e41e4957c13ecce82b4654d33f28
2020-04-01 18:45:58 +00:00
Xiangyu/Malcolm Chen
a64d4005ce
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b am: 4cbeb02147
...
Change-Id: I187199fc4c630c3e2783d87b082cc80d78b2af97
2020-04-01 18:45:38 +00:00
Xiangyu/Malcolm Chen
dc33eb7eda
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b am: e92894e5eb
...
Change-Id: Id3f4bc50b3c85cca481659ba89f807ba75d55538
2020-04-01 18:45:37 +00:00
TreeHugger Robot
fe873fffbb
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: 0949a64f97 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia894a3c8391e24d73b96e38417e5c4795d9fd8d6
2020-04-01 18:29:37 +00:00
TreeHugger Robot
72e8df570a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic09705bc5bae69804021a07d12485754a67ee297
2020-04-01 18:29:21 +00:00
Xiangyu/Malcolm Chen
06ff3f9777
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: d4beb34e3d
...
Change-Id: I5a1db677393dbe5e253b241a0d1d6a973ad72c33
2020-04-01 18:29:18 +00:00
Xiangyu/Malcolm Chen
4cbeb02147
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b
...
Change-Id: I10ee12fc95f9ae5fe7f6ff7f73aaf48d4011e82c
2020-04-01 18:29:13 +00:00
TreeHugger Robot
1f8a50cad8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours am: c21abaf2af -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3ddbfef5823171a56ab3cc93a0755245101f2d12
2020-04-01 18:29:04 +00:00
Xiangyu/Malcolm Chen
e92894e5eb
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504 am: 4a8c661a4b
...
Change-Id: Iaab00c8abddea685441125f52a15d9c987b22b05
2020-04-01 18:28:53 +00:00
TreeHugger Robot
0949a64f97
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours
...
am skip reason: subject contains skip directive
Change-Id: I52ec263d47b5d48c642845457c6c023087b8ef81
2020-04-01 18:11:54 +00:00
Xiangyu/Malcolm Chen
d4beb34e3d
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504
...
Change-Id: Icc4846045889e549180188d1a5fc1da63f5ce965
2020-04-01 18:11:40 +00:00
TreeHugger Robot
c21abaf2af
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51a0b4eaef -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4cc8cb3d86fa897be7d85a68a7ac5e6a9de7b4e0
2020-04-01 18:11:18 +00:00
Xiangyu/Malcolm Chen
4a8c661a4b
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev am: 9b3a03e504
...
Change-Id: Id6419e1264a0ddf014905e416db216538a9b3b52
2020-04-01 18:11:03 +00:00
TreeHugger Robot
51a0b4eaef
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-01 18:02:44 +00:00
Xiangyu/Malcolm Chen
9b3a03e504
Merge "Update string of showing conflict between 5G and DSDS." into rvc-dev
2020-04-01 17:57:07 +00:00
Beverly
216bf3c320
Add conversations image resource
...
- Conversations image resource is a compilation of the conversation
icons that are allowed to bypass DND
- Update category header text on DND > Display options for hidden notifications
page
- Update a11y bug in messages and calls pref pages that said images were
tappable
Test: manual
Bug: 151845457
Change-Id: I5387722abf0543b6e07378d498cc0085122c91b9
2020-04-01 13:51:52 -04:00
kholoud mohamed
f9a03cd415
Fix crash when trying to open app info page
...
Fixed a crash in App info page that happens when
no work profile exists, also fixed some unit tests.
Fixes: 152933121
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest
Change-Id: I7a1e5857cb1e10b96b33abd64359ba30459b1b13
2020-04-01 17:27:17 +00:00
Bonian Chen
6162b0c37d
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: 194be10913 am: 56b6bfe4d4 am: e5fee4a4d5
...
Change-Id: Ic933ad569fd2842264c4f15d596edd11890098db
2020-04-01 17:09:19 +00:00
Bonian Chen
813021d8f2
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 0b1cc9979e am: c39805c32e am: eda7705565
...
Change-Id: I96bb2316f7d5a1b71bfc147b7fef22cca19aa9a2
2020-04-01 17:08:22 +00:00
Bonian Chen
e5fee4a4d5
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: 194be10913 am: 56b6bfe4d4
...
Change-Id: I4bf6403f04d6e0f1ffe185e23336ccc3ce7f222e
2020-04-01 17:08:08 +00:00
Bonian Chen
8dfb729ceb
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: ac48e7c606 am: fa41f98986
...
Change-Id: I2a94611959bf373ab2a048599a50ed5a1ecf096a
2020-04-01 17:07:27 +00:00
Bonian Chen
eda7705565
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 0b1cc9979e am: c39805c32e
...
Change-Id: I1c64a207244dfdb3099ca08393cbfa02f7aa7c97
2020-04-01 16:54:57 +00:00
Bonian Chen
56b6bfe4d4
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: 194be10913
...
Change-Id: I5e44d16da9b11833610e20dfe87a9722d6fb04e4
2020-04-01 16:54:55 +00:00
Bonian Chen
fa41f98986
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0 am: ac48e7c606
...
Change-Id: I91e0f5f832729c4844a338ce85ccc66e807d803a
2020-04-01 16:54:16 +00:00
Bonian Chen
c39805c32e
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 0b1cc9979e
...
Change-Id: I796e56b08a0fe9a6e34b95e19e585a3e1e98e830
2020-04-01 16:34:26 +00:00
Bonian Chen
194be10913
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0
...
Change-Id: Ib3e1d5f3041251703875dbdd2c8d6bd55acdeac8
2020-04-01 16:34:24 +00:00
Bonian Chen
ac48e7c606
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595 am: 5d88416ee0
...
Change-Id: Id9ee5713de1bb803ae74cf43e2bc2d7b3f3d8803
2020-04-01 16:33:59 +00:00
Bonian Chen
0b1cc9979e
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
...
Change-Id: I06dcc9e2304a4fdb04ce9ba1dd30fb96e8045a2d
2020-04-01 16:19:07 +00:00
Bonian Chen
5d88416ee0
Merge "[Settings] Code Refactor" into rvc-dev am: 0d3732a595
...
Change-Id: I64e7a3b6c251626620a3b77cb91b68e6a1c26dd1
2020-04-01 16:18:52 +00:00
Bonian Chen
0d3732a595
Merge "[Settings] Code Refactor" into rvc-dev
2020-04-01 16:07:47 +00:00
