Weng Su
d2fb4f06a3
[Provider Model] Fix the "Cancel" button issue in the reminder dialog
...
- Do nothing if user cancel to turn off mobile data
Bug: 192052695
Test: manual test
atest -c ProviderModelSliceTest
Change-Id: Ib4b990a1f3f51a6bf11552a6018c73f8d7105736
2021-06-29 16:08:20 +08:00
Joe Bolinger
8d5b841fb1
Merge "Return enrollment consent status to caller." into sc-dev
2021-06-29 02:41:55 +00:00
Joe Bolinger
eb1dac69f0
Return enrollment consent status to caller.
...
Bug: 188847063
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL --ez require_consent true
Change-Id: I3285b379e175539c37355c67749c3d900e6ac62b
2021-06-28 17:51:46 -07:00
Curtis Belmonte
d8c142b44a
Adjust layout of the face education Lottie animation
...
Updates the size and position of the face enroll education Lottie
animation to support the latest version.
Test: Manual
Bug: 181373277
Change-Id: Ieccd3fa839f3ef329ed732a8b8623baf236c31ad
2021-06-28 15:37:34 -07:00
Erik Wolsheimer
89af43a4ab
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev
2021-06-28 20:39:21 +00:00
Erik Wolsheimer
13564b83dd
Do not refer to 'default' in default_print_service_main_switch_title
...
Bug: 192270303
Test: Manual
Change-Id: I9fd64f321ca259249b55e17b0ea8fff5ff6fe27f
2021-06-28 12:24:01 -07:00
TreeHugger Robot
f7c714547f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-28 19:20:17 +00:00
TreeHugger Robot
f91bc70bb6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-28 19:17:48 +00:00
Bill Yi
1d5f64b1e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4ed7b2ca9c085acb83d74f01fd82d1de4d5f89ac
2021-06-28 17:52:23 +00:00
Bill Yi
1b154d8247
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If00a7fee9c649efa3c49973c7f8465b94bb24299
2021-06-28 17:48:37 +00:00
Mill Chen
968151aa18
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev
2021-06-28 17:34:01 +00:00
Yanting Yang
ca0415d475
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev
2021-06-28 12:54:44 +00:00
Mill Chen
139fa375cd
Add line spacing multiplier for CollapsingToolbarLayout
...
Since there is a problem with a small line spacing between multiline
title of collapsing toolbar in a few locales, that caused the title is
overlapping with each other. Enlarging the line spacing by using
lineSpacingMultiplier to fix it.
Fix: 183223866
Test: visual verified
1) Change to MY locale
2) Navigate to Settings > Sounds & vibration > Do not disturb > Alarms &
other interruptions
3) Observe the title and check if it is overlapping with each other
Change-Id: I87f0af5151a6367bc623ac07b15e04c39b51c6ca
2021-06-28 18:39:20 +08:00
Bonian Chen
a3f28b034d
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev
2021-06-28 10:06:21 +00:00
Bonian Chen
d9bf670725
Revert "[Settings] Code Refactor - ActiveSubscip..."
...
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).
It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).
Reason for revert: Try to submit all of the modifications within single submit as a workaround.
Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
2021-06-28 09:32:54 +00:00
Hugh Chen
52b13e9795
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 346b049fb1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I1b667afef2b3858cb3cb627404090e5de7dba48b
2021-06-28 07:18:39 +00:00
Hugh Chen
b17f196c3d
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: c91f8b0991
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iec0be080d17d234d4ef68d1e29bbe7be18a9e91b
2021-06-28 07:18:34 +00:00
Hugh Chen
5e708fd301
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours am: 1e764fb0a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I64dbe7b1dddfaac7d0c35378951df62a4688a477
2021-06-28 07:18:13 +00:00
Hugh Chen
ad3ecbdd0c
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours am: d8ef6bc5af
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Iaf07be5625a927fdffacbe491140018873a40560
2021-06-28 07:18:08 +00:00
Hugh Chen
1e764fb0a6
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Ib79eaf776f222a1af892a881d6f9a9b2d6e28471
2021-06-28 07:07:07 +00:00
Hugh Chen
346b049fb1
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours am: 2a2a81dea5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I9c044bc08439ecd3132b3bacd0d47eddd9ccebb0
2021-06-28 07:07:01 +00:00
Hugh Chen
d8ef6bc5af
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I98eb7a2034a40bb28540b2e9dad3b84ecf4d430d
2021-06-28 07:07:00 +00:00
Hugh Chen
c91f8b0991
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I0b6e2fe7b4b98afe4f5eb906b515177f09621946
2021-06-28 07:06:57 +00:00
Hugh Chen
2a2a81dea5
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours am: b8aa9ad04d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
2021-06-28 06:57:36 +00:00
Hugh Chen
064bf9dd81
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I92ba93b2dccd7fd440b303c241c564af03721944
2021-06-28 06:57:32 +00:00
Hugh Chen
c87b09a9c4
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: c6362e92e8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ice6e60ffb90eb289b8a90e57acf0e48c07399d44
2021-06-28 06:52:22 +00:00
Hugh Chen
5a9f761f75
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: 3f2394bbc7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I54e4dc25694f503c3d4a48071929abc61be5ad6a
2021-06-28 06:52:18 +00:00
Hugh Chen
b42ecba8a3
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: a539c36421
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I8b5ed14819b9919e4bc3781220929b9ebeb858d2
2021-06-28 06:52:13 +00:00
Hugh Chen
8b9dbd066a
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: dbcebc42bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Id00a69e04103f387d0920a628222b5aeff3a3f5d
2021-06-28 06:52:08 +00:00
Hugh Chen
b8aa9ad04d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours am: e849d212b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: Id2fe388de56c84cd91effebf9b47e376fcf85e2f
2021-06-28 06:47:52 +00:00
Hugh Chen
d9fc75875e
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I389f623a1ac3a900c6c896ce363d3db1ca8a03d7
2021-06-28 06:47:48 +00:00
Hugh Chen
985d52d0c6
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours am: 49d4c89944
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ice63058d24150556d6b93398c1ca2f5dc76afc08
2021-06-28 06:42:26 +00:00
Hugh Chen
eb41b62299
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours am: f41af1a1e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I04479e17813fe34299739d0ba235a9cc711bf0b2
2021-06-28 06:42:22 +00:00
Hugh Chen
7f4a301b88
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours am: 48ceb503d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: Id62683035962b0c8df55c61fb574c5e86025ad06
2021-06-28 06:42:17 +00:00
Hugh Chen
3e51c20e21
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours am: 4c2b189379
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Ibe216a5f6ac77ae34c00eaf915c34397833fd71d
2021-06-28 06:42:13 +00:00
Hugh Chen
49d4c89944
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: I19651eae9672ae29ed50c9b795626b49d062f557
2021-06-28 06:37:50 +00:00
Hugh Chen
f41af1a1e3
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: If1c2a27ab396564127b1bd4d2030ff0a308d9fee
2021-06-28 06:37:47 +00:00
Hugh Chen
48ceb503d8
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I245db30a5d520b326015747008037cfaf9f10351
2021-06-28 06:37:37 +00:00
Hugh Chen
4c2b189379
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I8d51b562c0610f609892dd56fe81d70edbbf4109
2021-06-28 06:37:33 +00:00
Hugh Chen
c6362e92e8
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours am: 0cfe42b287
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ia9b38945171dae15032adfce0b20756aa32c478b
2021-06-28 06:37:13 +00:00
Hugh Chen
e849d212b7
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21
-s ours am: c551f39977
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141
Change-Id: I607bc56a88f50087d9e466eaad9a67d0f016463d
2021-06-28 06:37:12 +00:00
Hugh Chen
3f2394bbc7
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I810f4769b8a1c55306af2d8fbda1da427a06f48b
2021-06-28 06:37:08 +00:00
Hugh Chen
368ba20c95
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I3967969e09f69542cc461ca818d5024e7fe33f48
2021-06-28 06:37:08 +00:00
Hugh Chen
a539c36421
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
Hugh Chen
dbcebc42bf
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +00:00
Hugh Chen
ff719d5bd8
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
am: bee2daea18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631
[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
-s ours am: 76545f383c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00
Hugh Chen
0cfe42b287
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f
-s ours am: 505cc44596
-s ours am: 3fcb9c9811
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ibf35314504458240ec753c062f284225508701bd
2021-06-28 06:19:08 +00:00
Hugh Chen
367921a80d
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
2021-06-28 06:19:04 +00:00
Hugh Chen
499cfe303f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
2021-06-28 06:18:59 +00:00