Bonian Chen
57a9ee0669
[automerger skipped] Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
am: 1497df600b
-s ours am: af3b403b9f
-s ours am: 61029ee350
-s ours am: 78f8eacb3f
-s ours
...
am skip reason: Change-Id I36b74b2b4586546090fb88562e8f4f052a877709 with SHA-1 5faf771722
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020
Change-Id: Id1d6179ab3bec1832b2204bd73c8252ce4111354
2020-08-03 07:15:50 +00:00
Bonian Chen
b51365db9f
[automerger skipped] Merge "[Settings] WEA title wording change" am: 03ddb58767
am: 4ee1d08534
-s ours am: 0c658964aa
-s ours am: 538fc801f1
-s ours am: 8bd00ce7a4
-s ours
...
am skip reason: Change-Id I17e6659915e1038c8ab11ad4003c08f87bbdb82e with SHA-1 3e8425468b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021
Change-Id: If879b22e685a470c5e628f54ee7c6086776f7bb7
2020-08-03 07:15:24 +00:00
Bonian Chen
78f8eacb3f
[automerger skipped] Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
am: 1497df600b
-s ours am: af3b403b9f
-s ours am: 61029ee350
-s ours
...
am skip reason: Change-Id I36b74b2b4586546090fb88562e8f4f052a877709 with SHA-1 5faf771722
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020
Change-Id: I327fb07a6c0371439ad2fef18a2c0bd018e27db5
2020-08-03 06:54:28 +00:00
Bonian Chen
8bd00ce7a4
[automerger skipped] Merge "[Settings] WEA title wording change" am: 03ddb58767
am: 4ee1d08534
-s ours am: 0c658964aa
-s ours am: 538fc801f1
-s ours
...
am skip reason: Change-Id I17e6659915e1038c8ab11ad4003c08f87bbdb82e with SHA-1 3e8425468b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021
Change-Id: I62f2557e7aa05cde8e9d4f3e2f64f2db5caac75d
2020-08-03 06:53:58 +00:00
TreeHugger Robot
e4b26368c8
Merge "Add 'all apps' to notification filters" into rvc-qpr-dev am: dbcba6aa6a
am: 71b5854580
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282717
Change-Id: I1a18e71c01e1d2c07cc70286f8b9d08680c42f05
2020-08-03 06:38:25 +00:00
Bonian Chen
61029ee350
[automerger skipped] Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
am: 1497df600b
-s ours am: af3b403b9f
-s ours
...
am skip reason: Change-Id I36b74b2b4586546090fb88562e8f4f052a877709 with SHA-1 5faf771722
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020
Change-Id: I4038d3e3c25c8b4928f823c3806855fa05e0f110
2020-08-03 06:29:22 +00:00
Bonian Chen
538fc801f1
[automerger skipped] Merge "[Settings] WEA title wording change" am: 03ddb58767
am: 4ee1d08534
-s ours am: 0c658964aa
-s ours
...
am skip reason: Change-Id I17e6659915e1038c8ab11ad4003c08f87bbdb82e with SHA-1 3e8425468b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021
Change-Id: I5e38a41b634cc43e1f751c3fcc41c3c09c11f91f
2020-08-03 06:29:09 +00:00
TreeHugger Robot
71b5854580
Merge "Add 'all apps' to notification filters" into rvc-qpr-dev am: dbcba6aa6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282717
Change-Id: I401d8e91205ed444e5bee9dcc10e70b865490868
2020-08-03 06:16:49 +00:00
Bonian Chen
af3b403b9f
[automerger skipped] Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
am: 1497df600b
-s ours
...
am skip reason: Change-Id I36b74b2b4586546090fb88562e8f4f052a877709 with SHA-1 5faf771722
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020
Change-Id: Ic266a317124caa69ae91ccf6e3a5b5c113f46608
2020-08-03 06:04:55 +00:00
Bonian Chen
0c658964aa
[automerger skipped] Merge "[Settings] WEA title wording change" am: 03ddb58767
am: 4ee1d08534
-s ours
...
am skip reason: Change-Id I17e6659915e1038c8ab11ad4003c08f87bbdb82e with SHA-1 3e8425468b
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021
Change-Id: Iba1f68ef03f46cb708b8ec2e9c29e6a4e4c8ca09
2020-08-03 06:04:46 +00:00
TreeHugger Robot
dbcba6aa6a
Merge "Add 'all apps' to notification filters" into rvc-qpr-dev
2020-08-03 05:55:21 +00:00
Bonian Chen
1497df600b
Merge "[Settings] Learn more link should be removed when not supported." am: ec42c98e8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385020
Change-Id: I51ec6ca9199a44c4107b9308036fbc309c4af446
2020-08-03 05:45:33 +00:00
Bonian Chen
4ee1d08534
Merge "[Settings] WEA title wording change" am: 03ddb58767
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385021
Change-Id: I2233d2e1595d9e088c9b652200477f09ce87b601
2020-08-03 05:45:19 +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
Bonian Chen
ec42c98e8b
Merge "[Settings] Learn more link should be removed when not supported."
2020-08-03 05:25:20 +00:00
Bonian Chen
03ddb58767
Merge "[Settings] WEA title wording change"
2020-08-03 05:25:01 +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
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
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
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
Bonian Chen
1c5431bf23
[Settings] WEA title wording change
...
The wording of WEA need to align in UI entry and UIs within.
The "Wireless Emergency Alerts" should be the official wording for it.
Bug: 158498436
Test: build pass
Merged-In: I17e6659915e1038c8ab11ad4003c08f87bbdb82e
Change-Id: I4c1c4009287092703669f89981fd017ce605d4fe
2020-08-02 21:30:32 +08:00
Bonian Chen
fed54f7dc4
[Settings] Learn more link should be removed when not supported.
...
Learn more wording with link only help people when configured.
When no link available, these wording had better removed to avoid from
confusing people.
Bug: 159510116
Test: manual
Merged-In: I36b74b2b4586546090fb88562e8f4f052a877709
Change-Id: If7061e0be201b2f98964a7b0eec42cc17cb11ae3
2020-08-02 21:14:25 +08: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
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
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
Betty Chang
b8437f1c68
Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev
2020-07-31 14:11:05 +00:00
Julia Reynolds
cdf8888d89
Add 'all apps' to notification filters
...
Test: atest
Fixes: 141138853
Change-Id: If77e8186ddbfc754e7bb1a3d8541840f09db38d9
(cherry picked from commit 2d91b744cf
)
2020-07-31 14:03:49 +00:00
Julia Reynolds
184271e7e4
Merge "Add 'all apps' to notification filters"
2020-07-31 14:03:33 +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
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