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
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
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
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
TreeHugger Robot
891b3917e8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia9d2a1630c170ac9153c055552a67747ef74bc2f
2020-05-27 07:02:32 +00:00
TreeHugger Robot
16f777f19d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8b32bee65b -s ours
...
am skip reason: subject contains skip directive
Change-Id: I45400236a3c22758037d228e3bb270cbc7900f7d
2020-05-27 07:01:58 +00:00
TreeHugger Robot
8b32bee65b
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-27 06:39:10 +00:00
Yanting Yang
9cc4cb9ad1
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0 am: 7806bd93ab am: fce1313780
...
Change-Id: I69998327f3fdbbccb76a1e72d1ced2753d279704
2020-05-27 06:37:24 +00:00
Yanting Yang
8bf6d17d66
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: bf4f72b1fa am: 85b3154d07 am: d6b555c5ed
...
Change-Id: I075c38595264d7bd5a4f6340e821f0aa93b485ce
2020-05-27 06:36:34 +00:00
Automerger Merge Worker
57186a8a33
Merge "Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0 am: 0f540c174a" into rvc-qpr-dev-plus-aosp am: 2cab4b94df
...
Change-Id: I18492f9798fd537fccc10ee65f1841a59187077b
2020-05-27 06:36:02 +00:00
Automerger Merge Worker
0adff08bbe
Merge "Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3" into rvc-d1-dev-plus-aosp am: f544256d76 am: f4e5e3a713
...
Change-Id: I81a7fd9072257a0017179b7d740b9949e28b95ec
2020-05-27 06:34:23 +00:00
tim peng
00446d8fa9
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: 642f7582f3 am: 25f75d6aff am: df1b7e701c
...
Change-Id: I3ec654f628a29bfd883401e424e02eae7ad27f93
2020-05-27 06:33:36 +00:00
tim peng
d2b8f3662d
Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf8e am: e20f765484 am: ceb23093e9 am: 7a87480f82
...
Change-Id: Id18ba750a4c3902f56375d44337bef6bf9bafbb6
2020-05-27 06:32:45 +00:00
Yanting Yang
fce1313780
Merge "Improve scrolling performance for App Info page" into rvc-dev am: 4e14ffd77e am: 78062db3c0 am: 7806bd93ab
...
Change-Id: I26d9bea3a03a0d002d99f1ef0c37b13aa12dc8af
2020-05-27 06:22:45 +00:00
