Commit Graph

88958 Commits

Author SHA1 Message Date
pingzhi wang
860216208f Remove the option of resetting Euicc data.
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
2021-09-08 17:34:30 +02:00
Kevin Chyn
0fd589da40 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours am: 5d3df397f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3186236f132e13534f3d34123ba2abda88249cf0
2021-09-08 09:05:19 +00:00
Kevin Chyn
937224a479 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 am: f6f13b578e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf4f63e8db97424652ee3e183e8b260cf0a83ced
2021-09-08 09:05:06 +00:00
Kevin Chyn
c6f265a561 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893 am: 1b1c7ee277 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5e489e29fa9d9f8f1f9adb2fe36cacb8061e4356
2021-09-08 09:04:48 +00:00
Kevin Chyn
f6f13b578e [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ibcdd4ad0a07289379c7a468ecc339422481389e1
2021-09-08 08:51:44 +00:00
Kevin Chyn
5d3df397f2 [automerger skipped] [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: cd2016c7a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb287b60bff61521ee894e6e8099aa7561c574f9
2021-09-08 08:51:40 +00:00
Kevin Chyn
1b1c7ee277 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 am: 49bbd5b893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Icb0714151e308048598738e9a61607dc5361f6fe
2021-09-08 08:51:24 +00:00
Kevin Chyn
cd2016c7a0 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ief10091c6a8fed52e87ea0da33bf24c0bad34ce8
2021-09-08 08:26:47 +00:00
Kevin Chyn
49bbd5b893 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
2021-09-08 08:25:40 +00:00
TreeHugger Robot
f67025ae4f Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: 097ab944d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: Ida29e4669e0abe3099e6bd0c1e478961f60808fc
2021-09-08 08:22:28 +00:00
TreeHugger Robot
28a172a408 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d am: a5cc9839c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: I9312787c2fcdda1353e7e85b6ead85e86db3e80a
2021-09-08 08:22:04 +00:00
TreeHugger Robot
097ab944d3 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: Ib14609c4e8f875d1921638194461102dcdc6ede8
2021-09-08 08:09:04 +00:00
TreeHugger Robot
a5cc9839c2 Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev am: b370bfe77d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15724814

Change-Id: Ibb65b7999bdc331c4b15363bce71ece51a448c0e
2021-09-08 08:09:04 +00:00
TreeHugger Robot
b370bfe77d Merge "Fix USB tethering is not turned on with a single tap" into sc-qpr1-dev 2021-09-08 07:57:33 +00:00
Kevin Chyn
0b40e09ba6 [DO NOT MERGE] Update enrollment edu asset
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-08 00:09:13 -07:00
Kevin Chyn
df6ced6647 Update udfps lottie edu am: 2405b24311
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783457

Change-Id: I11688df2a12ac607aa9787dec8ee1900c33f56c5
2021-09-08 07:03:16 +00:00
Kevin Chyn
2405b24311 Update udfps lottie edu
Bug: 198858684
Test: Presubmit

Change-Id: Ic6e589ce738c8b1b82f892452518e4540a73f94b
2021-09-07 22:42:12 -07:00
Bill Yi
b87b6e663f Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 5a00ccefd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: I704119bc0e976de8b3c0f985645e01763b3139e3
2021-09-08 04:04:25 +00:00
Presubmit Automerger Backend
b17c1794f9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: 0347f953a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I298aaba89b64fbaf17518738888e88a6c99e98c0
2021-09-08 04:04:24 +00:00
Automerger Merge Worker
0a42e77619 Merge "Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4" into sc-v2-dev-plus-aosp 2021-09-08 04:03:49 +00:00
Presubmit Automerger Backend
b39af5a229 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours am: 948aadcfa4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I756568307181a8d4ded9cb30515d0754978494d0
2021-09-08 04:03:46 +00:00
SongFerng Wang
603a299462 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: fe74266ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I7b67445c6c8212f0bdf8f1c91b380f2059dead98
2021-09-08 04:03:37 +00:00
Bill Yi
09685239f6 Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b am: 7fc6f84bb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: I256857ab6c0c4454218bab44b152d0f39a18a07a
2021-09-08 04:03:34 +00:00
Presubmit Automerger Backend
9d308f8931 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours am: d83a1eb34f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4af3297bca98f900af2df9eaa7a9da7620669022
2021-09-08 04:03:33 +00:00
SongFerng Wang
12a16eb32d Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c am: 5bcabf3a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I558efa552f7c374dc980c85efbd8f1a9bbb3841f
2021-09-08 04:03:02 +00:00
Presubmit Automerger Backend
948aadcfa4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 77e02cbb71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9335ae0dbecdbdb71cbbd1955bc57f6dabf9aa7a
2021-09-08 03:59:12 +00:00
Bill Yi
7fc6f84bb9 Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: I47cbb350d9c0ab717293fca603684fbd1c5b3f03
2021-09-08 03:52:05 +00:00
Presubmit Automerger Backend
d83a1eb34f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad50a5dab73a9aa2d4c4bbcf6a0ca76055ef2948
2021-09-08 03:52:04 +00:00
Bill Yi
5a00ccefd2 Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev am: 47bb70329b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238

Change-Id: Icf02c454bdd87f96cf6cdd17ff03ed1f4df42c9f
2021-09-08 03:51:59 +00:00
Presubmit Automerger Backend
0347f953a9 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 am: 5d2b55f56c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I29440d5125a8b387e87bbc7fd6e141c42dabc294
2021-09-08 03:51:58 +00:00
SongFerng Wang
fe74266ba4 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I176f6a1b4a7d1551c721a5d63bcaabd5666daf82
2021-09-08 03:51:42 +00:00
SongFerng Wang
5bcabf3a78 Merge "[VoNR] VoNR settings" into sc-qpr1-dev am: 9354a7e81c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15737579

Change-Id: I5b5d99714ac24977c7a74926ae859bdb0bc0e94e
2021-09-08 03:51:39 +00:00
Bill Yi
47bb70329b Merge changes from topic "presubmit-am-7247fb5112be4c10a47a324ce3936eec" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
  Import translations. DO NOT MERGE ANYWHERE
2021-09-08 03:43:33 +00:00
SongFerng Wang
9354a7e81c Merge "[VoNR] VoNR settings" into sc-qpr1-dev 2021-09-08 03:38:02 +00:00
Presubmit Automerger Backend
5d2b55f56c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
Blank merge reason: commit message contains skip directive

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

Change-Id: I8a830a6f59d79a8c663e61240fe9072d5c07891d
2021-09-07 23:51:49 +00:00
Presubmit Automerger Backend
77e02cbb71 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
Blank merge reason: commit message contains skip directive

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

Change-Id: I82346cae7ca0fe69c3ad76815a9becf036c38ba2
2021-09-07 23:51:48 +00:00
Bill Yi
d770312ec1 Import translations. DO NOT MERGE ANYWHERE
BUG:198847997

Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
2021-09-07 23:51:36 +00:00
Automerger Merge Worker
fcaf1b5497 Merge "Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 am: c6f7cf99e9" into sc-v2-dev-plus-aosp 2021-09-07 20:58:35 +00:00
TreeHugger Robot
74a740a2cf Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 am: c6f7cf99e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: Ic034ec248154113199888fbb14c96dc44357d4bb
2021-09-07 20:58:31 +00:00
TreeHugger Robot
f999ee1943 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393 am: fb39c456a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I6d2ec035cebe8796d7c785a3a155251c44be3641
2021-09-07 20:58:26 +00:00
TreeHugger Robot
c6f7cf99e9 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I1a9d3533c92a0a97dc0e673e67a1f33f4ae3cd6a
2021-09-07 20:42:27 +00:00
TreeHugger Robot
fb39c456a8 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104

Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
2021-09-07 20:42:23 +00:00
TreeHugger Robot
ec9a292393 Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev 2021-09-07 20:29:33 +00:00
Julia Reynolds
fd4dcfe26b Remove unneeded NEW_TASK am: 717e3f6270 am: 8446a7d455
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: If97dc11d5259b2663ffa7b9db456ba2bdf87cde2
2021-09-07 19:03:34 +00:00
Julia Reynolds
cea348541f Remove unneeded NEW_TASK am: 717e3f6270 am: 60dd5ef026
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: Ibcc61f6a53090ec528f1908d511cc8395f7a6db9
2021-09-07 19:03:07 +00:00
Julia Reynolds
60dd5ef026 Remove unneeded NEW_TASK am: 717e3f6270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: I8f1564b6206d52fca34e510d41e772dcce4ed150
2021-09-07 18:51:32 +00:00
Julia Reynolds
8446a7d455 Remove unneeded NEW_TASK am: 717e3f6270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692

Change-Id: I7c184dc768503f4b121bf84c2339e531818efcc8
2021-09-07 18:51:27 +00:00
Julia Reynolds
717e3f6270 Remove unneeded NEW_TASK
To improve animations

Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +00:00
Julia Reynolds
520c80d649 Add 'snoozing' to NLS consent dialog
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +00:00
TreeHugger Robot
89a745dd8c Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811

Change-Id: Idd2af151dcb4c0b8bb8f7fd04f8574544590b467
2021-09-07 07:37:54 +00:00