Stanley Wang
f6398a09fa
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: ae8cdee154
...
Change-Id: I415a1fdce3245a313479331e9e37417525a24daa
2020-05-27 11:48:46 +00:00
Stanley Wang
ce77310aae
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906
...
Change-Id: Icec18853c7e234506e2b0c04abf6e1cd3b4cfe5e
2020-05-27 11:48:41 +00:00
TreeHugger Robot
4d44702659
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev
2020-05-27 11:36:45 +00:00
Stanley Wang
308b5f0efd
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c
...
Change-Id: Iffa0ca3bce76407c9e233f1131c4875b59667fb9
2020-05-27 11:34:16 +00:00
Stanley Wang
c83abc4906
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732
...
Change-Id: Icba85289fb428f8c5e36aa0b76a95e91364ff7d7
2020-05-27 11:34:10 +00:00
Stanley Wang
ae8cdee154
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732
...
Change-Id: I32e4a644e300109376a5f2b8a719250f6cc6cd27
2020-05-27 11:34:08 +00:00
Stanley Wang
a17be1f732
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
...
Change-Id: I7f9508b3d8487900655526ea1544306e8c58a7d9
2020-05-27 11:20:28 +00:00
Stanley Wang
f86897477c
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04
...
Change-Id: Ia8dd974c1c6f3d2fd1de6b67c0fe76a0407c02e5
2020-05-27 11:20:28 +00:00
Stanley Wang
12e3efcb04
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev
2020-05-27 11:12:02 +00:00
Benedict Wong
149cd3dd77
Hide IKEv2 VPN options if not supported
...
This change hides the VPN type options if the FEATURE_IPSEC_TUNNELS is
not supported on the device.
Bug: 156681625
Test: Manually tested
Change-Id: I3ef2e6144371596380351341e58c4ee84d49f39d
Merged-In: I3ef2e6144371596380351341e58c4ee84d49f39d
(cherry picked from commit e37fb7fc00
2020-05-27 09:22:54 +00:00
Sunny Shao
ee4ec4b33f
Enable the filterTouchesWhenObscured in Special app access
...
- Enable the filterTouchesWhenObscured attribute on all toggle
switches in all pages of the special app access
Fixes: 155288585
Test: make RunSettingsRoboTests
Change-Id: I011cfe4b7e4e624a8338332ac47a353f7f3ab661
2020-05-27 17:21:24 +08:00
Edgar Wang
235062075f
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: fdc5f3bf9f am: 51deaa3647 am: 30ae995f96
...
Change-Id: I34d4fe1dd8e1b7c105d39312d5b0101933c80f3c
2020-05-27 09:12:43 +00:00
Automerger Merge Worker
39d0b2fda6
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: d5f01a6f0d" into rvc-qpr-dev-plus-aosp am: 4293244a64 am: e443b64e17
...
Change-Id: I17d9b9b4918a491ccc73b6f4a85335bd03d953a3
2020-05-27 09:12:31 +00:00
Automerger Merge Worker
303e42f3df
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a" into rvc-d1-dev-plus-aosp am: 6fd3b32197 am: 91a0015d5d am: cf3792525b
...
Change-Id: I44966f4970970e860f5aec472c88bae5b6eca7e9
2020-05-27 09:12:17 +00:00
Bonian Chen
7963391e51
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 168e5cea66 am: 743b34c5d6 am: 75401aa884
...
Change-Id: Ibc4928a5f65bcccbc39c53e3036d66b100a84393
2020-05-27 09:12:06 +00:00
Bonian Chen
b447c72e86
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 8835dd7c3f am: f5f6e99bd1 am: 4647ef1f81
...
Change-Id: Ib53d3e33eaeef3a76ff7a099a9a188af0f6a211b
2020-05-27 09:11:59 +00:00
Bonian Chen
7fff0de2b3
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 am: 612e3c409c am: 5c8755d1ca am: 9e03c1fd57
...
Change-Id: Ie81baa57a792c2bd2fb42926427758b58310b761
2020-05-27 09:11:31 +00:00
Edgar Wang
30ae995f96
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: fdc5f3bf9f am: 51deaa3647
...
Change-Id: Ia033390abc976ad1cd2078df612dddff4b57ffef
2020-05-27 08:57:50 +00:00
Automerger Merge Worker
e443b64e17
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: d5f01a6f0d" into rvc-qpr-dev-plus-aosp am: 4293244a64
...
Change-Id: I7d36681e498e09cadd5a91689b8b4ac471bc4b88
2020-05-27 08:57:28 +00:00
Automerger Merge Worker
cf3792525b
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a" into rvc-d1-dev-plus-aosp am: 6fd3b32197 am: 91a0015d5d
...
Change-Id: Ia4f55724adcd915d3f6d0df9e9d4d49c4bcd5cf3
2020-05-27 08:57:01 +00:00
Bonian Chen
75401aa884
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 168e5cea66 am: 743b34c5d6
...
Change-Id: I5e16e690d66e314c0bd2c7154cd09249a393ba04
2020-05-27 08:56:49 +00:00
Bonian Chen
4647ef1f81
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 8835dd7c3f am: f5f6e99bd1
...
Change-Id: Ied9fc3830607483e36faf0c040771219a5a51c6d
2020-05-27 08:56:42 +00:00
Bonian Chen
9e03c1fd57
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 am: 612e3c409c am: 5c8755d1ca
...
Change-Id: I0378b52cb0e41141e8e497631ed707371ba00e77
2020-05-27 08:56:24 +00:00
Tim Peng
33914e738d
Improve feedback when failing transferring a disconnected device
...
-Set "failed" string for subtitle
-Add test case
Bug: 157139936
Test: make -j42 RunSettingsRoboTests
Change-Id: I1fcd51f954a63cbc9ac0e573e5a8bb43cca6f087
2020-05-27 16:49:17 +08:00
Edgar Wang
51deaa3647
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: fdc5f3bf9f
...
Change-Id: I3dab7f7291fee0bb524cac7232552851995b132a
2020-05-27 08:43:32 +00:00
Automerger Merge Worker
4293244a64
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: d5f01a6f0d" into rvc-qpr-dev-plus-aosp
2020-05-27 08:43:28 +00:00
Automerger Merge Worker
91a0015d5d
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a" into rvc-d1-dev-plus-aosp am: 6fd3b32197
...
Change-Id: Ic0caee5db35922d71e10339b45f9fd98c5430b9e
2020-05-27 08:43:23 +00:00
Edgar Wang
c03563db3c
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a am: d5f01a6f0d
...
Change-Id: I0aa4ef07e69c9200ffa0609e5435dc92eddfba71
2020-05-27 08:43:23 +00:00
Bonian Chen
743b34c5d6
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 168e5cea66
...
Change-Id: I7abe6c3deab189a5c316eb1714876165a1f56241
2020-05-27 08:43:05 +00:00
Bonian Chen
f5f6e99bd1
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a am: 8835dd7c3f
...
Change-Id: Iff4b7a30ca55ccfb19dbf1aafe9a2bdf1a1d593a
2020-05-27 08:42:59 +00:00
Bonian Chen
5c8755d1ca
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8 am: 612e3c409c
...
Change-Id: Ic522ebe6f7882594b57f183fa7ac6d383cf94e98
2020-05-27 08:42:54 +00:00
Edgar Wang
fdc5f3bf9f
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a
...
Change-Id: If6f7d422b3d014e7840af374e54fd8b3c0ed6efd
2020-05-27 08:31:51 +00:00
Automerger Merge Worker
6fd3b32197
Merge "Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a" into rvc-d1-dev-plus-aosp
2020-05-27 08:31:49 +00:00
Edgar Wang
8de2ab6a66
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: c3ce91706a
...
Change-Id: I71b4e430f93e7637017a86f0c8c3adcc33d51716
2020-05-27 08:31:43 +00:00
Bonian Chen
8835dd7c3f
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a
...
Change-Id: I2580df4b12bf1d4c0017660f6539961996dd3637
2020-05-27 08:31:41 +00:00
Edgar Wang
d5f01a6f0d
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451 am: 4cec7ebd7a
...
Change-Id: Ia39b83f9ceca595832be0aa8f73f63173f7529c5
2020-05-27 08:31:39 +00:00
Bonian Chen
612e3c409c
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: db253d31d8
...
Change-Id: Ib5cf4d28e58881d0e16a9dc2364353707701a944
2020-05-27 08:31:36 +00:00
Bonian Chen
168e5cea66
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d am: 1a10069e6a
...
Change-Id: I95726c88b3b886443e7a34d55925bb0e0a6206e7
2020-05-27 08:31:29 +00:00
Edgar Wang
c3ce91706a
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
...
Change-Id: I3240458b67d03283dac6bb15d9fbef02ef7febeb
2020-05-27 08:19:00 +00:00
Edgar Wang
4cec7ebd7a
Merge "Update summary of Gesture" into rvc-dev am: e1a9a56451
...
Change-Id: Ic0649f4c8488bf86ca366b60c468dc0e9dd5ef5f
2020-05-27 08:18:56 +00:00
Bonian Chen
1a10069e6a
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
...
Change-Id: Ia0af2c7912b6d6af31ba7cb67747f9cd952f4428
2020-05-27 08:18:36 +00:00
Bonian Chen
db253d31d8
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev am: d9d9a9be8d
...
Change-Id: I06a1e5612384f99dea432ca90058269a661f4c4a
2020-05-27 08:18:32 +00:00
Edgar Wang
e1a9a56451
Merge "Update summary of Gesture" into rvc-dev
2020-05-27 08:14:17 +00:00
Bonian Chen
d9d9a9be8d
Merge "[Settings] Avoid SIM toggle switch loopback" into rvc-dev
2020-05-27 08:08:35 +00:00
Automerger Merge Worker
87764a2306
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours am: ff8349363a -s ours" into rvc-qpr-dev-plus-aosp am: 4c22e729a9 -s ours am: 5f764518a1 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If354eb6b7d1de453f9c6b3cb09f476519f97ceba
2020-05-27 07:54:23 +00:00
Automerger Merge Worker
22bb466d56
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours" into rvc-d1-dev-plus-aosp am: 88a7bfdc96 -s ours am: e52995173e -s ours am: 37876b5809 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8620e79e7f2b30f6dc6e4ddd21f3f34fcfce4d75
2020-05-27 07:54:18 +00:00
TreeHugger Robot
f2c845f671
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 891b3917e8 -s ours am: d2de2e054f -s ours am: 1a525a5453 -s ours am: 03323d787e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5e809f8d12fdfd503e3a85bbb1f663eb8ed3b928
2020-05-27 07:54:07 +00:00
Automerger Merge Worker
5f764518a1
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours am: ff8349363a -s ours" into rvc-qpr-dev-plus-aosp am: 4c22e729a9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic76c83079199ef0ec17f85758ed33c803125a500
2020-05-27 07:39:57 +00:00
Automerger Merge Worker
37876b5809
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours" into rvc-d1-dev-plus-aosp am: 88a7bfdc96 -s ours am: e52995173e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic3c73946eabd6116991f6a4571ff06b4ab4d8d84
2020-05-27 07:39:43 +00:00
TreeHugger Robot
03323d787e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 891b3917e8 -s ours am: d2de2e054f -s ours am: 1a525a5453 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic84a45e30fd97fd6f4152c434c6dad52254db0e5
2020-05-27 07:39:21 +00:00
