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
Julia Reynolds
6fb9669e44
Some more a11y fixes
...
Min height, and announcing button changes
Test: manual
Fixes: 152729661
Fixes: 152728211
Change-Id: I886ce046da3dd5b2b93673aee0cd5bdc37d5fc48
2020-04-01 12:05:25 -04:00
Yanting Yang
f7b884f59b
Fix SupportDashboardActivityTest
...
Since the screen title of SupportDashboardActivity was changed to
page_tab_title_support string for fixing breadcrumb before.
We need to correct the test case to fix the test function fail.
Bug: 147851992
Test: robotests
Change-Id: I14e30ac2a5210bb2d89657cff5772c06c6e8fe5a
2020-04-01 20:13:59 +08:00
TreeHugger Robot
95e6951457
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 1c4ac1dded am: 058907083f am: 2f9f81cba9
...
Change-Id: I8b000a22cb8dcb579e11c8f565c3e9b6dbd24ff4
2020-04-01 10:44:53 +00:00
TreeHugger Robot
061991a75b
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: 6b7d3f8290 am: 6243bd9fce am: 761c9b2078
...
Change-Id: I4130d4af58685681a97fd56f6094cfb59c5ac17c
2020-04-01 10:44:46 +00:00
TreeHugger Robot
2f9f81cba9
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 1c4ac1dded am: 058907083f
...
Change-Id: Iedc8db9f123e78fe3445d3f625648edfd969b71a
2020-04-01 10:44:44 +00:00
TreeHugger Robot
a2ca682ed8
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 010f812a43 am: c8979ad780
...
Change-Id: I0aadd8848652c9c0cf7363c3d48e9e2f05e9f4c3
2020-04-01 10:44:34 +00:00
TreeHugger Robot
761c9b2078
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: 6b7d3f8290 am: 6243bd9fce
...
Change-Id: I01da76c7c8e78389c0cffb75a91f4c233683fba3
2020-04-01 10:32:10 +00:00
TreeHugger Robot
c8979ad780
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 010f812a43
...
Change-Id: Ibeb439c4d1f3c1ed70ca340e8c47a4f716846e9e
2020-04-01 10:31:58 +00:00
TreeHugger Robot
058907083f
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 1c4ac1dded
...
Change-Id: Iadcf67208672f37c3ee522924ced8841e03723c1
2020-04-01 10:31:56 +00:00
TreeHugger Robot
6243bd9fce
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: 6b7d3f8290
...
Change-Id: I6699e559e4e587bacd1d46c477f494af88423109
2020-04-01 10:14:42 +00:00
TreeHugger Robot
1c4ac1dded
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d
...
Change-Id: Ie6730d17b2c868be31ae164768dcbeb85e42e8c2
2020-04-01 10:14:41 +00:00
TreeHugger Robot
010f812a43
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d
...
Change-Id: I5823b17e494a83fb7df031b82217a9cd4ef3ea3c
2020-04-01 10:14:14 +00:00
TreeHugger Robot
6b7d3f8290
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
...
Change-Id: Ic1243f986b4c236c14c0c840fe7069d9557c35bc
2020-04-01 09:52:54 +00:00
TreeHugger Robot
da8eb18b3d
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4
...
Change-Id: I22b80f8c34280390e8f7797e50172967494dff1e
2020-04-01 09:52:32 +00:00
TreeHugger Robot
93162ce9f4
Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 09:39:12 +00:00
Bonian Chen
bf51b28174
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6 am: bc39d3254a am: e054fb5bf5 am: c4d11f0aeb
...
Change-Id: I415d54b89c828540e30fdc05fc9e7080b7e54c52
2020-04-01 08:06:37 +00:00
Bonian Chen
2cb13245b4
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: d9f98f935b am: f1f31c5cac am: 39b3c1b53c
...
Change-Id: I170e593417752ad6e6121f648d65f0aec9d0952a
2020-04-01 08:06:14 +00:00
Bonian Chen
c4d11f0aeb
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6 am: bc39d3254a am: e054fb5bf5
...
Change-Id: I5d6799e927a0188e9a3100a31929bf973923332d
2020-04-01 08:05:53 +00:00
