Automerger Merge Worker
b75144e7e5
Merge "Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577" into rvc-qpr-dev-plus-aosp
2020-05-27 12:17:40 +00:00
TreeHugger Robot
5942096e2f
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: e56caf1577
...
Change-Id: I78038830aba9608d9f6d9bf75eca0a37fcddee41
2020-05-27 12:17:28 +00:00
TreeHugger Robot
43a459cb1b
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7 am: a9df21b508
...
Change-Id: Ife00386ab5045ed1121707a202308e35b56404ee
2020-05-27 12:17:11 +00:00
TreeHugger Robot
5763102add
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: ebef186155
...
Change-Id: Ib8cb46616fa412f4ad0d8e4a73858f3f08972f52
2020-05-27 12:06:29 +00:00
TreeHugger Robot
e56caf1577
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
...
Change-Id: Ibbe7b902e7e0a618a607059a33e94f42cbc30df6
2020-05-27 12:05:08 +00:00
TreeHugger Robot
a9df21b508
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659 am: e3e2ce74f7
...
Change-Id: I1bd4fa1d60bf9362541c7a2e8227c2f84ca940f1
2020-05-27 12:05:07 +00:00
TreeHugger Robot
e3e2ce74f7
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
...
Change-Id: Icf1d67fe6a49b14e3bebb19ff4f8c3a3a691b09f
2020-05-27 11:55:38 +00:00
TreeHugger Robot
ebef186155
Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659
...
Change-Id: Ifef1e319dacc0d12c4ae7d162d221daa0a342597
2020-05-27 11:55:38 +00:00
Stanley Wang
7f2598c52a
Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: f86897477c am: 308b5f0efd
...
Change-Id: I23eeb88826967c6acc2399757ce3949e88580755
2020-05-27 11:48:59 +00:00
Automerger Merge Worker
1467812913
Merge "Merge "Fix the search result "Google Account" doesn't work." into rvc-dev am: 12e3efcb04 am: a17be1f732 am: c83abc4906" into rvc-qpr-dev-plus-aosp
2020-05-27 11:48:51 +00:00
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
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
4c22e729a9
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
2020-05-27 07:24:21 +00:00
Automerger Merge Worker
e52995173e
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 skip reason: subject contains skip directive
Change-Id: I8e856b156b73ea00a1ea277604faec6a1475bd8c
2020-05-27 07:24:14 +00:00
TreeHugger Robot
dfcf23d3aa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours am: ff8349363a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5cb478317bb1845133efa55d163e2d7e592ba9e9
2020-05-27 07:24:12 +00:00
TreeHugger Robot
1a525a5453
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 891b3917e8 -s ours am: d2de2e054f -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie8f18586699f3ddba032f0a5b805835f25bc27ee
2020-05-27 07:24:04 +00:00
Automerger Merge Worker
88a7bfdc96
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
2020-05-27 07:12:57 +00:00
TreeHugger Robot
d2de2e054f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 891b3917e8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I474f90c6f769aa6d2ee3043c1bd86e33362857fb
2020-05-27 07:12:45 +00:00
TreeHugger Robot
046cf71dfe
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia72d1361b589d5006efec99ce2fe97086c3e4f17
2020-05-27 07:12:45 +00:00
TreeHugger Robot
ff8349363a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours am: 16f777f19d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I1b4617cadaf42be162fbc010586b35fed7591935
2020-05-27 07:12:39 +00:00
