PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,103 Commits 1 Branch 0 Tags
a873184d3232c2eff35442e8bed5a2a553c84c4a
Commit Graph

75103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
a873184d32 [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: b51365db9f -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: I2972e5211b3d495eb8a2f57f0ae473c91df586a6
 2020-08-03 07:41:18 +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
TreeHugger Robot
51d788a340 Merge "Add 'all apps' to notification filters" into rvc-qpr-dev am: dbcba6aa6a am: 71b5854580 am: e4b26368c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282717

Change-Id: Iefee6b18cc525803b09ee8e7396ce4ed380ed2b0
 2020-08-03 06:54:08 +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
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
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
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
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
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
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
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
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
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
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