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
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
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
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
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
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
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
f1f31c5cac
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: d9f98f935b
...
Change-Id: I944102b069e7a983e4067f95505f4ef8c2be7043
2020-04-01 07:29:46 +00:00
Bonian Chen
3f6f4e44e0
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5 am: 98f1a405c6
...
Change-Id: Ic20177035e6902b8d55c52baa039f540bdd574ac
2020-04-01 07:29:24 +00:00
Arc Wang
26d3b7dd1b
[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test
...
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
2020-04-01 15:25:37 +08:00
Bonian Chen
d9f98f935b
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
...
Change-Id: I3687e0c1884ea802801c3eb00aafe933428cb817
2020-04-01 07:17:07 +00:00
Bonian Chen
98f1a405c6
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev am: cfbdcaf9f5
...
Change-Id: I9bc040d577318ffdec9ff8bd0634e766d2774b8b
2020-04-01 07:16:47 +00:00
Bonian Chen
cfbdcaf9f5
Merge "[Settings] Avoid from crash when pull out SIM" into rvc-dev
2020-04-01 07:00:15 +00:00
TreeHugger Robot
f444344c5d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: 80036cffa9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I12e9cdb4c20c5e5b6519a14553af0397ed60d11c
2020-04-01 05:44:28 +00:00
TreeHugger Robot
93d950aa04
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours am: d9a0046fd6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea664fae56e6e1822567ec0c7564b9c1f826b2bc
2020-04-01 05:44:10 +00:00
TreeHugger Robot
80036cffa9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: I195e28633ce35791208174a7b3d61eb83dadbcdb
2020-04-01 05:32:13 +00:00
TreeHugger Robot
d9a0046fd6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 58cadcc6ee -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id41bbf1c7274c0475b5ed29577a88c17559ca9fa
2020-04-01 05:31:47 +00:00
TreeHugger Robot
58cadcc6ee
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-01 05:13:22 +00:00
Bonian Chen
bd03b17a62
[Settings] Avoid from crash when pull out SIM
...
Avoid from crash through exception handling.
Bug: 148803073
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest
Change-Id: I10aff50b6f3fc50b2f336ee320740f9f4a81e256
2020-04-01 12:05:38 +08:00
Bill Yi
20e0cbec41
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3d6289030419addc1ccd223de40be5e1bc422df8
2020-03-31 20:55:13 -07:00
Automerger Merge Worker
0295e02499
Merge "Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e" into rvc-d1-dev-plus-aosp
2020-04-01 03:49:43 +00:00
Goven Liu
4b67490445
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb
...
Change-Id: I4409afa7c65bbf7d6d5ac051b8ebd7e258bedf91
2020-04-01 03:49:40 +00:00
Goven Liu
d0bc27f31e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 336834b17e
...
Change-Id: Id059dbb0a8fc61d225f2efff917cba62dd3822d3
2020-04-01 03:49:40 +00:00
Goven Liu
336834b17e
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I4d369739d3d83771f220cacb1846338056367969
2020-04-01 03:36:29 +00:00
Goven Liu
15ff53ecfb
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad
...
Change-Id: I681ff5a91c45eca3d6f80dc61aed8907d08842b5
2020-04-01 03:36:05 +00:00
Goven Liu
783b0257ad
Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev
2020-04-01 03:16:34 +00:00
Bill Yi
5f16525806
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ie47208d5573659f3bdcc57c8d9933a2245625669
2020-03-31 20:12:42 -07:00
Bonian Chen
39ff4e4495
[Settings] Code Refactor
...
1. Code refactor for android.telephony.ims.ImsManager.
2. Remove unused methods
Bug: 140542283
Test: build pass
Change-Id: I187789a8a553a2c073b3591807dfebfafba6bc14
2020-04-01 10:58:27 +08:00
Malcolm Chen
0b2b2b50d7
Update string of showing conflict between 5G and DSDS.
...
Bug: 152786064
Test: manual
Change-Id: I3ab8dc326caff5b7480c17b9a8004ed91a8b0578
2020-03-31 17:19:16 -07:00
Sarah Chin
8f14309c6a
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours am: 902793ffa7 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:40:46 +00:00
Sarah Chin
902793ffa7
[automerger skipped] Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a am: c03048cd27 -s ours
...
am skip reason: Change-Id If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 with SHA-1 77dea1beb0
2020-03-31 23:26:57 +00:00
Sarah Chin
c03048cd27
Merge "Rename calls to isGlobalModeEnabled" am: b6fd42a06a
...
Change-Id: Ibd354d26acab6e5f8195d4f93b302ec9c362d9be
2020-03-31 23:15:07 +00:00
Sarah Chin
b6fd42a06a
Merge "Rename calls to isGlobalModeEnabled"
2020-03-31 23:02:20 +00:00
