Goven Liu
5a8e9e452a
Merge "[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need." into rvc-dev
2020-04-08 22:37:35 +00:00
TreeHugger Robot
f1f1074034
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
am: b0171b6a58
am: 95784202e7
...
Change-Id: I345084140b6b406f9c6b4e2ce41337c242ed5e1a
2020-04-08 15:49:03 +00:00
TreeHugger Robot
95784202e7
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
am: b0171b6a58
...
Change-Id: I659f336987b2c798ece95f6ba27d689cad33a20e
2020-04-08 15:34:38 +00:00
TreeHugger Robot
b0171b6a58
Merge "Update display logic for no shared data." into rvc-dev am: e886ef9e9a
...
Change-Id: I3a9cfaa21188906acb440216314cf412bf3221ed
2020-04-08 15:21:33 +00:00
TreeHugger Robot
e886ef9e9a
Merge "Update display logic for no shared data." into rvc-dev
2020-04-08 15:11:37 +00:00
Beverly
56a7e26e90
Add ellipsis to dnd notification settings
...
To indicate there's more text than showing.
Test: manual
Fixes: 152901378
Change-Id: Iefb688b07a301be09e0ab747429d2b99b49ea1a6
2020-04-08 14:38:26 +00:00
Bonian Chen
c88f8b8e40
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
am: 18997b6dae
am: 2544f3762f
...
Change-Id: I0686297193ec32565f56e496bbbf1cee021a8020
2020-04-08 12:47:33 +00:00
TreeHugger Robot
d37ed99ac3
Merge "Update string to Android security update" into rvc-dev am: f10afc071f
am: cf485a9b31
am: 2321c0aded
...
Change-Id: Ia7b96d94e72a1a7f997a3a998dd952e443b4c853
2020-04-08 12:47:26 +00:00
Bonian Chen
2544f3762f
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
am: 18997b6dae
...
Change-Id: I8465c1034e2401c6f685321661d1bc560d667896
2020-04-08 12:38:27 +00:00
TreeHugger Robot
2321c0aded
Merge "Update string to Android security update" into rvc-dev am: f10afc071f
am: cf485a9b31
...
Change-Id: I5f8c22753cd8a767a41893673a02f1290bd49d6b
2020-04-08 12:38:18 +00:00
Bonian Chen
18997b6dae
Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
...
Change-Id: Ie9fa3c09327df4404544f00e3ebbdbcfe06abfb6
2020-04-08 12:19:23 +00:00
TreeHugger Robot
cf485a9b31
Merge "Update string to Android security update" into rvc-dev am: f10afc071f
...
Change-Id: I127edfd51a04449945bda3262ef3de4c201de026
2020-04-08 12:19:08 +00:00
Bonian Chen
c1b20e631a
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 12:12:04 +00:00
TreeHugger Robot
f10afc071f
Merge "Update string to Android security update" into rvc-dev
2020-04-08 12:05:59 +00:00
Mill Chen
3cde287564
Update string to Android security update
...
For consistency with Mainline, we changed the string from Android
security patch level to Android security update.
Fixes: 151841551
Test: robotests
Change-Id: I6e53cef54add7f5f00b9766a5f2e9fdea9a62dd5
2020-04-08 09:08:01 +00:00
calvinpan
a971c458ba
Check is5gEntryDisplayed in NETWORK_MODE_LTE_GSM_WCDMA mode
...
Add is5gEntryDisplayed() check in in NETWORK_MODE_LTE_GSM_WCDMA mode to
prevent that show "LTE(recommand)" everytime.
Bug: 153301072
Test: By manual
1. Reproduce issue
2. Verify the patch
Change-Id: I96311a1e399efd160a3f7290f85df778b2d6f0c4
2020-04-08 16:58:56 +08:00
TreeHugger Robot
8985a8dc5e
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
am: 800cc2c277
am: 854559e572
...
Change-Id: I0680df9e735908abed0f73752966f44ea118f020
2020-04-08 07:57:28 +00:00
TreeHugger Robot
854559e572
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
am: 800cc2c277
...
Change-Id: Icc5688817560e1db448357bfd7a62cd184236ef8
2020-04-08 07:46:03 +00:00
TreeHugger Robot
800cc2c277
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev am: 1e49ff8ba7
...
Change-Id: Iafb889858cd911b7b684eb92d09344ac7371e1f3
2020-04-08 07:38:10 +00:00
TreeHugger Robot
1e49ff8ba7
Merge "[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2" into rvc-dev
2020-04-08 07:23:53 +00:00
Bonian Chen
6ce37e3f53
[Settings] Code refactor
...
Remove unused inport and adjust the import sequence.
Bug: 150352656
Test: build pass
Change-Id: Ifd1e37e56d0b0ae1d5b31723b8545ae95e707a66
2020-04-08 14:26:46 +08:00
govenliu
a82d2c8a88
[Wi-Fi] Use getUriHelpString() result to judge if Settings APP should register the help button click event and file related intent if need.
...
The Openroaming help button should show only when the getHelpUriString() value is not null, and need to handle the click event in Settings APP.
Bug: 146669261
Test: Adjust unit test cases:
1. make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
2. make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I27a717c3014b01cc464908bac56f64bd08aa5da3
2020-04-08 13:41:15 +08:00
Bonian Chen
7939abdcdc
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
am: c0c78129c8
...
Change-Id: I62468efd3412cebe9bcaf843d29178f9441819b5
2020-04-08 05:34:54 +00:00
Bonian Chen
c0c78129c8
Merge "[Settings] Code refactor" into rvc-dev am: 05cb60b258
am: 403c8aa4ee
...
Change-Id: I0738d3cac701a396f334ace6b0a6ea309bd11c13
2020-04-08 05:21:36 +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
05cb60b258
Merge "[Settings] Code refactor" into rvc-dev
2020-04-08 04:52:23 +00:00
Bonian Chen
d9fadefbe3
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
am: 03e935f435
...
Change-Id: If482e609b9b7d043082af4c06ad0f31b3bbcda2d
2020-04-08 04:04:32 +00:00
tim peng
21ca7a4348
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
am: 3ffe34a48b
am: 76b3da3eee
...
Change-Id: I6611149863e814988ec4d7f6252517a60f1cf538
2020-04-08 04:04:27 +00:00
tim peng
a789813202
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
am: f8d7c09e36
am: 6e423144e7
...
Change-Id: I4296dce2d19f8615be409884fc04057d0b7427b2
2020-04-08 04:04:07 +00:00
Arc Wang
067757f8d9
[Wi-Fi] Fix TalkBack focus lost in SavedAccessPointsWifiSettings2
...
PreferenceGroup in a controller is not in a RecyclerView,
TalkBack loses focus after PreferenceGroup#removeAll.
To fix it, only add/remove the preference if it's necessary.
Bug: 153278854
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test
Change-Id: Ie9ad5481c33865dce2b7db04d0f969b1f49b80e1
2020-04-08 11:58:27 +08:00
Bonian Chen
03e935f435
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: Ibc81e28dc1a5c4ae07199c2627035d2e4f6716d3
2020-04-08 03:50:47 +00:00
tim peng
76b3da3eee
Merge "Settings crashed by a null worker" into rvc-dev am: e189ac522e
am: 3ffe34a48b
...
Change-Id: I98ce7ff3c2375ee69847d772cf3fd8f8710c99c2
2020-04-08 03:50:42 +00:00
tim peng
6e423144e7
Merge "Transferring to a cast device should not close the output switcher" into rvc-dev am: f1f7b861d9
am: f8d7c09e36
...
Change-Id: Ie0b24981147270289334843c48e22009415d2595
2020-04-08 03:50:30 +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
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
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
TreeHugger Robot
f790e1a0eb
[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: 625cd52625
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8a35bc769b478e6b5c7260d9caf4cffecf22336e
2020-04-08 01:22:52 +00:00
TreeHugger Robot
625cd52625
[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: Ia522e179e984c67e350d8b426983762866dc00e2
2020-04-08 01:07:38 +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
Bill Yi
abc3d1b44e
[automerger skipped] Import translations. DO NOT MERGE am: ae901dc181
-s ours am: 2d031a2068
-s ours am: ca155cd26d
-s ours am: 2723f2940f
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id89fe606c15accc2096709a26f4a44801a1622c9
2020-04-08 00:37:33 +00:00
TreeHugger Robot
2eede1c6d1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 18f56af885
-s ours am: 5e4fb3f052
-s ours am: 3d59946a23
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8ba0d94228faf83e2ba73a09397967a1ff809a2d
2020-04-08 00:37:27 +00:00
Menghan Li
ab7a98be3b
Merge "Fix gesture navigation popup is displaying inconsistently on the System navigation page." into rvc-dev am: a43f842c56
am: 48596c45a4
am: 6552b09e6b
...
Change-Id: I59eda1d7c4efcb1e51d1e384569327f8fcf999c4
2020-04-08 00:37:22 +00:00
Bill Yi
2723f2940f
[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: I73c748c7da2ced7b197911e6aad97f6cee51e963
2020-04-08 00:37:01 +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
TreeHugger Robot
5064d96e3a
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2020-04-08 00:18:18 +00:00
TreeHugger Robot
3d59946a23
[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: I149e7a24a322cd99bad2faa8e58e83382b225268
2020-04-08 00:13:55 +00:00