PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,334 Commits 1 Branch 0 Tags
2ff9679b47c2588c20b2b47b2887b5770ee32eb2
Commit Graph

86334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
2ff9679b47 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours am: 643ebcefe7 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I065e1ee3165d8daacff38036f28cfefb6a7d9cd2
 2021-08-07 14:40:05 +00:00
Weng Su
f602af0086 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours am: 911f5834ea -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I74a756680b55ff6e0d5d74bb4d8802bdda23698c
 2021-08-07 14:40:01 +00:00
Weng Su
654aa7c6f4 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 2b7ed69c38 -s ours am: 2378decda4 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: Idf17eaf8a5f4d644e746c28c22dc6dc139fd541f
 2021-08-07 14:39:57 +00:00
Weng Su
64db783b7f [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 8a7f073e63 -s ours am: 97423591da -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I79989224d7abd818f27bf8453de9380e8aea5e22
 2021-08-07 14:39:53 +00:00
Weng Su
643ebcefe7 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 9bc34092c5 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I13095c03a59fe8d36d023623de696401c96badfe
 2021-08-07 14:26:54 +00:00
Weng Su
911f5834ea [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 4be07137ed -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I376d743eda6363bd3f9a46469b73abfc38f88876
 2021-08-07 14:26:50 +00:00
Weng Su
2378decda4 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours am: 2b7ed69c38 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I1234cef9c8095e544099d768474d72fee33e629e
 2021-08-07 14:26:35 +00:00
Weng Su
97423591da [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours am: 8a7f073e63 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: Ia25b39166f6de513396f124f7fc951db6dd384d3
 2021-08-07 14:26:32 +00:00
Weng Su
9bc34092c5 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I3694ac5dadb33fc6488631a2b008ec39c0ac9240
 2021-08-07 14:14:25 +00:00
Weng Su
4be07137ed [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I02e45b3c9021b7f7d351e8fc9b3a9d7fdfee4c6b
 2021-08-07 14:14:21 +00:00
Weng Su
2b7ed69c38 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours am: 7b91612fd0 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I5b63a4ecf3f00148137c6de108518cdb430948bc
 2021-08-07 14:13:40 +00:00
Weng Su
8a7f073e63 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours am: 052d536e07 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: Ife6f913675a6de6900a021273197aa42e8280f78
 2021-08-07 14:13:35 +00:00
Weng Su
7b91612fd0 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: b659749934 -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I0ffaf1c83a744ae30993c379a244b40f65a2ef04
 2021-08-07 14:02:33 +00:00
Weng Su
052d536e07 [automerger skipped] Add comment to AndroidManifest am: fa1e3870d8 am: adf9fffeff -s ours 
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: Ie0c56032ded21100b3c689922bd03802b6ec9338
 2021-08-07 13:58:37 +00:00
Weng Su
adf9fffeff Add comment to AndroidManifest am: fa1e3870d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: If6e576072291a47fdd7889db1484bf9450786e53
 2021-08-07 13:37:05 +00:00
Weng Su
b659749934 Add comment to AndroidManifest am: fa1e3870d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754

Change-Id: I00f48e5875c3d60bfa91b61322c36d35b3e38533
 2021-08-07 13:37:03 +00:00
Joe Bolinger
3016050375 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 am: 59f46b4385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I72884b2523f3093b6bf47a939ee01050fd85befd
 2021-08-07 00:54:08 +00:00
Joe Bolinger
8c0c4c0463 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 am: 8fd8c0973e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I65c40d0e5cfdfed661aa44844377c0364e65e4fa
 2021-08-07 00:53:46 +00:00
Joe Bolinger
0560b36964 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: 0b705abada am: 8d0ad43149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: Icdb6dd28c9aebea739928d4cd72fc0723820717d
 2021-08-07 00:53:39 +00:00
Joe Bolinger
8fd8c0973e Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: If8501d3a03dd0283f3244ec9dba80596018239a3
 2021-08-07 00:39:35 +00:00
Joe Bolinger
59f46b4385 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: fd115c5db2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I7b3af9b3a11572706110082206b7ec56883b06ce
 2021-08-07 00:39:30 +00:00
Joe Bolinger
8d0ad43149 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 am: 0b705abada 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I7d6949733bf2eb07e15f15ac05a58c469828f5a6
 2021-08-07 00:39:14 +00:00
Joe Bolinger
fd115c5db2 Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: Ic06afcf18cb02b0255d0626891542af0d85de626
 2021-08-07 00:22:35 +00:00
Joe Bolinger
0b705abada Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178

Change-Id: I2cebeaef5456520f8d4a40fa20c6c8f469007218
 2021-08-07 00:21:37 +00:00
Joe Bolinger
336d3e5501 Merge "Fix extra password confirm prompts during managed setup." into sc-dev 2021-08-07 00:07:22 +00:00
Bonian Chen
c4cee7a2c4 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 am: a5517006b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: I2788578b228a06fd4ceb40d9f418a2d7f07b4e76
 2021-08-06 03:47:41 +00:00
Bonian Chen
ea9c9df826 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 am: 23f97347a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: I98572de38df258b03c812f82787555f84106df0a
 2021-08-06 03:47:15 +00:00
Bonian Chen
23f97347a3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Ia86d71fb7b70dc1ff9c6ff4d2b902b09baf736b2
 2021-08-06 03:32:23 +00:00
Bonian Chen
a5517006b3 Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991

Change-Id: Idb67e48147c633e60c317876abdb19c48fcb90cf
 2021-08-06 03:31:26 +00:00
Bonian Chen
68ac2d69c0 Merge "[Settings] eSIM existance detection rule change" into sc-dev 2021-08-06 03:15:49 +00:00
Beverly Tai
3e17438e29 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 am: 6adbe74b92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: I74309c854257da46d8ddace193cf79ac49b71ec9
 2021-08-05 22:00:25 +00:00
Beverly Tai
63a72d90a6 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 am: 88364551db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Iaa6271766812e0c1746dd6688db22f9225c7ea6a
 2021-08-05 21:59:48 +00:00
Beverly Tai
88364551db Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Iff92c4d045ee1e6997109d5c475337ba4cbb7b00
 2021-08-05 21:51:11 +00:00
Beverly Tai
6adbe74b92 Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086

Change-Id: Ic4dd5daa7ec14ebd94d54ac789a9d93c6ff7b556
 2021-08-05 21:50:27 +00:00
Beverly Tai
60773b9a37 Merge "Use pattern subtitle string on all enroll stages" into sc-dev 2021-08-05 21:28:22 +00:00
Joe Bolinger
c11e01f39d Fix extra password confirm prompts during managed setup. 
Managed accounts may set the pin/pattern before enrollment begins.

Fix: 191608999
Test: atest BiometricEnrollActivityTest
Change-Id: I4065989ecc26ce72ffd0e06e7c6e68029a11908f
 2021-08-05 11:08:48 -07:00
Beverly
c9a609eb6d Use pattern subtitle string on all enroll stages 
So the views won't relayout and cause the pattern
to render in a strange way.

Test: manual
Bug: 194368020
Change-Id: If6fd7ade4fd6783fe5d1ef78acc847928e01bd29
 2021-08-05 17:17:30 +00:00
Bonian Chen
35df60f316 [Settings] eSIM existance detection rule change 
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Bug: 194197762
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
(cherry picked from commit 848d097b94)
(cherry picked from commit 824deb0ee3727f23ab68a75176825c4c73f482a9)
 2021-08-05 06:31:35 +00:00
Bill Yi
960e2d9932 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -s ours am: f841d3fa4f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491

Change-Id: I12f92caef2679322b3a14e4b714adc838695b99b
 2021-08-05 05:59:55 +00:00
Bill Yi
855e7142de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -s ours am: dbc7513d83 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491

Change-Id: Ia6352b12151959f64f5b55bf9ab1cd16a34a3bfc
 2021-08-05 05:59:47 +00:00
Bill Yi
dbc7513d83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491

Change-Id: Iaf8cfd8e0cb14b2832b016e8056446b863562447
 2021-08-05 05:51:13 +00:00
Bill Yi
f841d3fa4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours am: b6321f88ad -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491

Change-Id: If6e7a3f07941a61f16d553f95c13f59529cdcbe4
 2021-08-05 05:50:26 +00:00
Bill Yi
b6321f88ad [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466491

Change-Id: I49e111e71a2ac12186aa85f0bc37629854a60390
 2021-08-05 05:38:19 +00:00
Bill Yi
997cef968a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -s ours am: 7805fe0aee -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498

Change-Id: I7db24c8df1e5656ec7d51de6ea8d63c908fbc797
 2021-08-05 05:33:48 +00:00
TreeHugger Robot
fbe0a69666 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f -s ours am: ae616ac517 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466503

Change-Id: I275bc926f12026912e9738bb37e4b8a7c35d7853
 2021-08-05 05:33:28 +00:00
Bill Yi
8a68a14dd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -s ours am: 83c0c7b420 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498

Change-Id: I97cb90cf2b64c419f55d0e98fe9ab3cfbbadb1b5
 2021-08-05 05:32:59 +00:00
TreeHugger Robot
5f6983fe43 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f -s ours am: 6c804d29c8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466503

Change-Id: I0300914e05c0d5ffe9dec728ec9425e7b8073005
 2021-08-05 05:32:54 +00:00
Bill Yi
7805fe0aee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498

Change-Id: Ifda89d01ba6bc2fa34a17a24555249e500ded11b
 2021-08-05 05:19:45 +00:00
Bill Yi
83c0c7b420 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f -s ours am: 2a1b39c51f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466498

Change-Id: I661fac098bb7467326e854e84e17cbe08eb04671
 2021-08-05 05:17:21 +00:00
TreeHugger Robot
6c804d29c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466503

Change-Id: Ifbdce45b3809fcac581e42c9db7f9b64f873fb7f
 2021-08-05 05:17:14 +00:00