Bill Yi
578caaa73b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: d0b332ff79 -s ours am: ea02b2f8bc -s ours am: 867e9db69d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: If8bc6185a89153efa10f051b0d50ac20bb04a0f3
2020-08-03 06:05:12 +00:00
Bill Yi
13ebe6d866
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: 1a2b17caf7 -s ours am: 71855b46fe -s ours am: 22799cb188 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: I670a91b2b3ada1797acc6de5d54bdb778c026c89
2020-08-03 06:04:57 +00:00
Bill Yi
867e9db69d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: d0b332ff79 -s ours am: ea02b2f8bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: I0d47f9b5e0a62f946fc0fd846d68e8fbd29b231d
2020-08-03 05:44:18 +00:00
Bill Yi
22799cb188
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: 1a2b17caf7 -s ours am: 71855b46fe -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: Iae3ce4e16cc32f81193fc0260f6bd2c5fdb2244c
2020-08-03 05:43:56 +00:00
Bill Yi
ea02b2f8bc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: d0b332ff79 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: Id97b06c1591f57e09ec21166e11800ae0aa6de25
2020-08-03 05:34:42 +00:00
Bill Yi
71855b46fe
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours am: 1a2b17caf7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: I2e4a71eca15320d4bfb7067de08a027d6da229a8
2020-08-03 05:19:03 +00:00
Bill Yi
d0b332ff79
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: Id73c8faf93f57ad301435a2305064920f9606463
2020-08-03 05:10:11 +00:00
Bonian Chen
7f9543a6d5
[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours am: 3adb69ca05 -s ours am: f336c3d93c -s ours
...
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: Ic613082d649ef4de9785d06b585a4aa8cd51db06
2020-08-03 05:08:42 +00:00
Bill Yi
1a2b17caf7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8214e3f395 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12291931
Change-Id: I8a6a8305639a74cd38ada85ac059ccd002b8afa9
2020-08-03 05:08:40 +00:00
Bonian Chen
f336c3d93c
[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours am: 3adb69ca05 -s ours
...
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: I10b8eec2bf94aa05526712cc670ab718a34dc1dc
2020-08-03 04:43:34 +00:00
Bonian Chen
3adb69ca05
[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours am: 3da8082299 -s ours
...
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: Iea01c8158e2d2f7025d0d1ce1a0bf463b47b4f7f
2020-08-03 04:32:33 +00:00
Bonian Chen
3da8082299
[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours am: 692b75c3cd -s ours
...
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: I2c70947e2cf9fe38a9560f73ecbf040e66e6c659
2020-08-03 04:11:59 +00:00
Bonian Chen
692b75c3cd
[automerger skipped] Merge "Hide sliceView if Slice is null" am: 811d654a6d am: 2aba7f043e -s ours
...
am skip reason: Change-Id I2b5b34d068ba4590f65a284d4f62a1cc77f9666f with SHA-1 590042b3ba is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: I5cd573731209ef02419f564e0135e70d34a04882
2020-08-03 03:45:50 +00:00
Bonian Chen
2aba7f043e
Merge "Hide sliceView if Slice is null" am: 811d654a6d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385016
Change-Id: Iffeb4e5ded6ebda5680b04afe83abd0803fb3d57
2020-08-03 03:22:43 +00:00
Bonian Chen
811d654a6d
Merge "Hide sliceView if Slice is null"
2020-08-03 03:05:03 +00:00
TreeHugger Robot
2d17c1de22
Merge "Update language to comply with Android's inclusive language guidance" am: e66c8beaa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248949
Change-Id: Ia5924e549ab2c88d934322f810e547e9c879d0a2
2020-08-03 02:00:15 +00:00
TreeHugger Robot
e66c8beaa5
Merge "Update language to comply with Android's inclusive language guidance"
2020-08-03 01:44:01 +00:00
Bill Yi
8214e3f395
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b581c7ca33a79416c26f500dfe13ebb0a9c16f4
2020-08-02 23:32:14 +00:00
Arc Wang
22034b3413
[automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 am: 675894883c -s ours am: 3feacc9bbb -s ours
...
am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa23c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448
Change-Id: I7ee4f4ef2fc657241eb3f6d5ee44002f33387338
2020-08-02 14:14:14 +00:00
Arc Wang
b072ab54b3
[automerger skipped] Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 am: b049b018d3 -s ours am: 61b043a6dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953
Change-Id: I7b4c68f4b41721496431f320c2f2e6e0413fd1c8
2020-08-02 14:14:00 +00:00
Arc Wang
3feacc9bbb
[automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 am: 675894883c -s ours
...
am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa23c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448
Change-Id: I0f81e538d00f7e26b0dedb2cc1faeec223c017d3
2020-08-02 13:53:24 +00:00
Arc Wang
61b043a6dd
[automerger skipped] Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 am: b049b018d3 -s ours
...
am skip reason: skipped by user arcwang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953
Change-Id: Iacf72797b77cc41218e2136e00377fcc15c21981
2020-08-02 13:52:55 +00:00
Raff Tsai
53cbfe28bb
Hide sliceView if Slice is null
...
Fixes: 142035673
Test: robolectric, visual
Change-Id: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
Merged-In: I2b5b34d068ba4590f65a284d4f62a1cc77f9666f
2020-08-02 12:26:10 +00:00
Arc Wang
675894883c
Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448
Change-Id: I84f736a1797e9b6b31bc007fc88df912ca9f5eeb
2020-08-01 02:57:49 +00:00
Arc Wang
b049b018d3
Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953
Change-Id: I20946b3619d96eefbb23d48ba4b43b2bc68ed115
2020-08-01 02:57:37 +00:00
Arc Wang
f99a6355fd
Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" am: b3952b0826
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271446
Change-Id: Ib23a2f6acceb63394a654e967e989aa64b05e931
2020-08-01 02:56:30 +00:00
Arc Wang
5d86bebb32
Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev
2020-08-01 02:34:26 +00:00
Arc Wang
f833684e28
Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev
2020-08-01 02:34:05 +00:00
Arc Wang
b3952b0826
Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner"
2020-08-01 02:32:08 +00:00
Betty Chang
3f582f8276
Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 am: 481db1eff9 am: 48b44acaa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445
Change-Id: I6e72d1d7eb4ec6a23c2cd8cf68eedbef39c106e9
2020-07-31 15:05:49 +00:00
Betty Chang
48b44acaa1
Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 am: 481db1eff9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445
Change-Id: I468ea7573857f9ce81a7c029098d0febc4fe2d06
2020-07-31 14:45:43 +00:00
Betty Chang
481db1eff9
Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445
Change-Id: I1739c80b479db6be75041e94716babf66d7609d6
2020-07-31 14:33:16 +00:00
Julia Reynolds
cddb9eef7c
Merge "Add 'all apps' to notification filters" am: 184271e7e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12260966
Change-Id: Ie6fbc0196517e2fb185ada221b4e5e9f4c123951
2020-07-31 14:15:27 +00:00
Betty Chang
b8437f1c68
Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev
2020-07-31 14:11:05 +00:00
Julia Reynolds
184271e7e4
Merge "Add 'all apps' to notification filters"
2020-07-31 14:03:33 +00:00
Al Sutton
131258309b
Update OWNERS to reflect current team am: 44dd1aa26e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282023
Change-Id: I7b7b52ee27ad7dd48b7f8acea8c6189263d8bee5
2020-07-31 12:14:40 +00:00
Al Sutton
44dd1aa26e
Update OWNERS to reflect current team
...
Test: CI verifies email addresses
Change-Id: I3da2759a28e715667ce594aea15508522bdd72c6
2020-07-31 11:54:57 +01:00
TreeHugger Robot
bc3f1bb060
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours am: 873b675292 -s ours am: dcff57ce27 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: If42fae2724ef0aa4a51a1d9d5d51bd8271924212
2020-07-31 02:42:29 +00:00
TreeHugger Robot
2e383e0c55
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours am: ffb6f25613 -s ours am: b83c7e3014 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: Ic8df6aefe83af9c5343776b6b1b247aa592f4c61
2020-07-31 02:42:16 +00:00
TreeHugger Robot
008a4f12dc
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours am: 2c6bcf8b89 -s ours am: 18e4e317af -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: I5b14a762004e173e88e0ff0f974756e82c5aec1d
2020-07-31 02:42:01 +00:00
Arc Wang
9af4bcc987
Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" am: 8734b131fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248952
Change-Id: I10e3c3c58554bbd7308a4d38302b8a8ff9f016cd
2020-07-31 02:41:32 +00:00
Arc Wang
33cde5dbee
[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner
...
"Do not validate" is not secure and must not be used in any production
network. R Suggestions API already does not allow connections with
no Root CA certificate.
Bug: 162466484
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
Manually add or edit an EAP method Wi-Fi network and observe CA
certificate spinner options.
Change-Id: Ica5ecf8805c51d7cdce7b16e02e0dd79d5f64754
Merged-In: Icf97199967faa2e359b0120a8c989bd1df2c6cea
2020-07-31 10:28:11 +08:00
TreeHugger Robot
dcff57ce27
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours am: 873b675292 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: Ia2c1b4d11087808683fdb7fa8b81aa83a7d4767d
2020-07-31 02:26:01 +00:00
TreeHugger Robot
b83c7e3014
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours am: ffb6f25613 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: I1b65cf1e1f64180d3cce01fed944073579128bad
2020-07-31 02:25:43 +00:00
TreeHugger Robot
18e4e317af
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours am: 2c6bcf8b89 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562
Change-Id: Ie74a91304170da0b93b43c44b2e201fb42f19cdb
2020-07-31 02:25:17 +00:00
Arc Wang
8734b131fb
Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate"
2020-07-31 02:22:02 +00:00
TreeHugger Robot
f10aaacc34
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: 68670e66bb -s ours am: a0b71099a1 -s ours am: bfb77aad73 -s ours am: 26bcb5227a -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288
Change-Id: Ic350f7c9c36d8028e6c3df681b929c844baa4e1e
2020-07-31 02:09:02 +00:00
TreeHugger Robot
496fd83863
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: dd285067fa -s ours am: 8c2af47193 -s ours am: 35fb5bd2d2 -s ours am: f271d9e28a -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285
Change-Id: Ib0c3d109ab17a8b6311152809d55ef4ab4a2e821
2020-07-31 02:08:56 +00:00
TreeHugger Robot
01ee90a581
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: 656da9da88 -s ours am: 60fa4115a3 -s ours am: 03c99f4243 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288
Change-Id: Ib942324ce92cfd1fa53ae032f7a8304497764a91
2020-07-31 02:08:46 +00:00
TreeHugger Robot
2c2d341e81
[automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: c1c90a2f95 -s ours am: fb020898bb -s ours am: 16f97498c0 -s ours
...
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285
Change-Id: I06acef58d75574c0f75cd8d4b477a6930f4d7887
2020-07-31 02:08:11 +00:00