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
aa317b0608
[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: Ib3824669303173ae01bec3f0365d9d79de5921c8
2021-08-07 14:13:38 +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
2085122f60
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
am: 59f46b4385
am: 3016050375
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I0264a51c640c19a5b9299aeba2203f1f1eafed73
2021-08-07 01:09:59 +00:00
Joe Bolinger
763883ee30
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: fd115c5db2
am: 8fd8c0973e
am: 8c0c4c0463
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: Icf3995b5d98a14b766552d8118850db37cd3865d
2021-08-07 01:09:45 +00:00
Joe Bolinger
cccd842cdb
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 0b705abada
am: 8d0ad43149
am: 0560b36964
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I860e39056ac56bed7812925c1e8380823e9c2cb4
2021-08-07 01:09:29 +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
087078208c
Merge "Fix extra password confirm prompts during managed setup." into sc-dev am: 336d3e5501
am: 76b51c0d57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15463178
Change-Id: I347fa7ed007573a1b83ba84d1ecb3ac48c9d2caf
2021-08-07 00:38:53 +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
76b51c0d57
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: I3068e68b02de218d9defca06faf4e19f974f48ea
2021-08-07 00:21:48 +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
7d312f9f71
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: a5517006b3
am: c4cee7a2c4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: I3f4d898d0c8c4ffc9da1f1e58373f8c5a9d39475
2021-08-06 04:05:46 +00:00
Bonian Chen
c9fb07307d
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: 23f97347a3
am: ea9c9df826
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: I782e3efc4f10948b4416ec81d80b2b64266f1bc5
2021-08-06 04:05:21 +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
99e2670a4d
Merge "[Settings] eSIM existance detection rule change" into sc-dev am: 68ac2d69c0
am: 15870af85b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15453991
Change-Id: Ib1a3f6bec88bdffee5f8e00e7a1cda237d013d86
2021-08-06 03:46:49 +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
15870af85b
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: Ieeda02e359feb275a88fda113fe33a9639af41ee
2021-08-06 03:31:28 +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
279a179043
Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
am: 6adbe74b92
am: 3e17438e29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086
Change-Id: If6793e98da24057a2fef22faa29327eaed7229cc
2021-08-05 22:09:24 +00:00
Beverly Tai
62d4f1e67f
Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
am: 88364551db
am: 63a72d90a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086
Change-Id: I160491193bbf70eb8c98e10e296b20f2291fdca4
2021-08-05 22:09:10 +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
46c330617a
Merge "Use pattern subtitle string on all enroll stages" into sc-dev am: 60773b9a37
am: 4cb88993aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15473086
Change-Id: I21e0a8eb21ce39e4186c275a9096d1c490b24a36
2021-08-05 21:59:24 +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
4cb88993aa
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: Ie3627c5baadba7b0968ed7495a597fbe9ef80f60
2021-08-05 21:50:26 +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
Julia Reynolds
17dda0faec
Merge "Rename RadioButtonPreference -> SelectorWithWidgetPreference."
2021-08-05 20:34:13 +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
TreeHugger Robot
e3e33471a9
Merge "TARE Global Toggle"
2021-08-05 17:08:53 +00:00
alinasuarez
1031bb2693
TARE Global Toggle
...
Add functionality to the global toggle within the TARE homepage in the
developer settings. This allows for users and developers to turn these
settings on/off.
Bug: 195552339
Test: Manual (open Settings > System > Developer Options > TARE > turn
on/off the global toggle and leave and go back and make sure it is being
kept track of correctly)
Change-Id: Ifb8dee1aeb04d2b6883ee9e449ed8ab0493dc27a
2021-08-05 15:33:52 +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
b363c433ae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours am: f841d3fa4f
-s ours am: 960e2d9932
-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: I33377f9fc4416f2c8c5cfc12fc308b9e34813d00
2021-08-05 06:19:47 +00:00
Bill Yi
2d8a2b2666
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours am: dbc7513d83
-s ours am: 855e7142de
-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: I3840fa2596ab3cb92125fde3a690eb3587b32e75
2021-08-05 06:19:29 +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
a414a0787d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a7b2f538d
-s ours am: b6321f88ad
-s ours am: 4464b58412
-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: Idcaaab7a28095522a31d49a4d0b141ee81a33522
2021-08-05 05:59:06 +00:00