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
Hugh Chen
ba30b04cc3
Fix USB tethering is not turned on with a single tap
...
Before this CL, the USB default settings will set default usb functions
to RNDIS when tethering is started. Because in some devices, the NCM
is used instead of RNDIS to start tethering. If RNDIS is set in the
device that uses NCM to start tethering, it will cause start
tethering failed.
This CL will use the current functions to set default usb functions
to fix this issue.
Bug: 195068679
Test: make -j42 RunSettingsRoboTests
Change-Id: Ic9353c5ac76c0cd517318a4304fa214d6b2201d2
2021-08-06 03:13:17 +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
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
4464b58412
[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: Id3af84dc33ed419874ed614c5ccf01570c454114
2021-08-05 05:50:22 +00:00
Bill Yi
948316d370
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 7805fe0aee
-s ours am: 997cef968a
-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: Ia4294ccd45a721dbedd71f985407279b4d3e4bea
2021-08-05 05:42:36 +00:00
TreeHugger Robot
bbca92191a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: ae616ac517
-s ours am: fbe0a69666
-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: I698857dc6816abd6fd76d2b496bcb4e6b8c189c0
2021-08-05 05:42:31 +00:00
Bill Yi
95fb29f074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 83c0c7b420
-s ours am: 8a68a14dd9
-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: I317e3b6821ba9b05491c630e89de5e310daee64e
2021-08-05 05:42:27 +00:00
TreeHugger Robot
258915625f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: 6c804d29c8
-s ours am: 5f6983fe43
-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: Id363dddef94c52dc421fe2ff75b7bd659ea25f1e
2021-08-05 05:41:58 +00:00
TreeHugger Robot
2cf27c4025
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-05 05:41:23 +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
TreeHugger Robot
bb4a3072d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2429d12357
-s ours am: 52a588b2f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15466506
Change-Id: I7884fdcd6f1fd4575f0e408a3e2b06b947642659
2021-08-05 05:22:24 +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
Bill Yi
ce559c04db
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1cc662122f
-s ours am: 2a1b39c51f
-s ours am: 926e66633c
-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: I180e8046f965557fc7ea95e77db6040688e034d5
2021-08-05 05:16:53 +00:00
TreeHugger Robot
abfd98c6e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c47427811f
-s ours am: 25b204f3db
-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: I9f9661b77ecd59861d1f5adc7e3d9b63f749440a
2021-08-05 05:16:49 +00:00