TreeHugger Robot
dd28bb7e12
Merge "Fix the non-working DND toggle" into sc-dev am: 53124fa7b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109294
Change-Id: Ic7d9e9f527f083ecd8f6ce0f8216f7e5305171d5
2021-06-29 06:47:21 +00:00
TreeHugger Robot
53124fa7b3
Merge "Fix the non-working DND toggle" into sc-dev
2021-06-29 06:35:55 +00:00
Yi-Ling Chuang
6a83c73624
Fix the non-working DND toggle
...
The pendingIntent of the DND toggle was set to immutable previously
which doesn't allow any modification. This CL fixes this by making it
mutable.
Fixes: 191865710
Test: Search "dnd" and make sure the toggle has effect upon modification
Change-Id: Iade256cee8885cb80ade5ca95cc50065c2a78da2
2021-06-29 12:46:08 +08:00
Edgar Wang
baf8e94445
Merge "Tweak Factory reset page for Material Next style" into sc-dev am: 87d34a0ec6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15124034
Change-Id: I7d95273d91d465f941b793ce49d8b429109008a8
2021-06-29 04:21:33 +00:00
Wesley Wang
3df9608ca6
Merge "Update batteryDiffEntry filter condiction" into sc-dev am: 4c1b805cef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080731
Change-Id: I32a35f5a3185a4c5f841a821594fbecf6bb0acd7
2021-06-29 04:21:25 +00:00
Tiffany Nguyen
637ec7bdc4
Merge "Log Battery Saver states." into sc-dev am: dc93eda197
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125481
Change-Id: I9cb0b0d978133b032d3ba311cefffba57b13bf1f
2021-06-29 04:21:18 +00:00
Edgar Wang
87d34a0ec6
Merge "Tweak Factory reset page for Material Next style" into sc-dev
2021-06-29 04:18:56 +00:00
Wesley Wang
4c1b805cef
Merge "Update batteryDiffEntry filter condiction" into sc-dev
2021-06-29 04:17:29 +00:00
Tiffany Nguyen
dc93eda197
Merge "Log Battery Saver states." into sc-dev
2021-06-29 04:13:02 +00:00
Joe Bolinger
953b2deb54
Merge "Return enrollment consent status to caller." into sc-dev am: 8d5b841fb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15133398
Change-Id: Ia66f4df37a37f3756377e7a12568e752c4bc8301
2021-06-29 02:57:22 +00: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
43d437810e
Adjust layout of the face education Lottie animation am: d8c142b44a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15132425
Change-Id: I90f83abfe934d4cb177faef78273f4a01a99e9e0
2021-06-28 23:50:13 +00: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
8434eed3e3
Merge "Do not refer to 'default' in default_print_service_main_switch_title" into sc-dev am: 89af43a4ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15130027
Change-Id: I27d13c5e9ceb5440b3cb4a5e3a5a960bd757c5ae
2021-06-28 20:51:47 +00: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
TreeHugger Robot
392e4a67ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f7c714547f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129443
Change-Id: I4c9f99b331952bed4e68e84f76bbc17c9ae01e2c
2021-06-28 19:28:19 +00:00
TreeHugger Robot
93cf2766da
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: f91bc70bb6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15129261
Change-Id: I7e03b1d91d2124e50751b4757530fdbc4bbfb5ae
2021-06-28 19:28:04 +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
Mill Chen
4b5d1e78d5
Merge "Add line spacing multiplier for CollapsingToolbarLayout" into sc-dev am: 968151aa18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15126437
Change-Id: Ie2fa17748dab18f8659acf4621e15845c15fb3a6
2021-06-28 17:50:50 +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
Edgar Wang
73305b4458
Tweak Factory reset page for Material Next style
...
- Change Text appearences
Bug: 189389716
Test: Visual
Change-Id: I0bcc40c62892c12f9c3dcd74873906d96b392e86
2021-06-28 21:28:07 +08:00
Yanting Yang
5f125d8284
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev am: ca0415d475
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102780
Change-Id: I068ec6d73a402db50f4a292fd76d8943ca8ea415
2021-06-28 13:02:41 +00:00
Yanting Yang
ca0415d475
Merge "Clear legacy code about AppAndNotificationDashboard" into sc-dev
2021-06-28 12:54:44 +00:00
Tiffany Nguyen
f9416e6a40
Log Battery Saver states.
...
Test: Unit test
Bug: 189914747
Change-Id: Ib815e60a52ec549df2ab2b90df29bca1eeeef339
2021-06-28 11:22:20 +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
6be744ee95
Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273
Change-Id: Iec3c149b6caeb872c952d833083a3570f9ebb6f7
2021-06-28 10:14:32 +00: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
c52b6bc4bb
[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: 52b13e9795 -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: Ib77c524d7d6f6ee78e36659c4a4d70f8afc57e6b
2021-06-28 07:27:07 +00:00
Hugh Chen
9e08ebacf4
[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: b17f196c3d -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: I7c6ed59e3f807f98b8229f4161d61e8bf3255568
2021-06-28 07:27:02 +00:00
Hugh Chen
603f0a5b14
[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: 5e708fd301 -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: I7fdccda404710a99d41947dcc5612c658317c3f1
2021-06-28 07:26:57 +00:00
Hugh Chen
8e922b95f3
[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: ad3ecbdd0c -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: I069c91a0f6cc3fa255bd261537f75f00e2ddd07c
2021-06-28 07:26:48 +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
a531e96867
[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: c87b09a9c4 -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: I92d5987902f1422630b48d2e4d7a01fba9c3339f
2021-06-28 06:57:22 +00:00
Hugh Chen
1913f6d881
[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: 5a9f761f75 -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: I660ac34a94f84213c1e631be087aea15e839802b
2021-06-28 06:57:18 +00:00
Hugh Chen
e3db867566
[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: b42ecba8a3 -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: I4a6f95c49f93bf8de6e0f6a4bcb377775bc5a60c
2021-06-28 06:57:08 +00:00