PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,249 Commits 1 Branch 0 Tags
28b5b3361d0fb46e109b191ae345dda9711df5b8
Commit Graph

83249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Bolinger
28b5b3361d 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: Idbe7aa5032a111f43afa43d884edd81160834a5f
 2021-06-29 02:59:17 +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
0d0a045bad 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: Ieaa753a52bfae3b43938f72a462b4a11316d7c8e
 2021-06-28 23:51:03 +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
7fa9100f4a 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: I9e78359c2613542dbf3a025c2e1337c214cd261e
 2021-06-28 20:52:41 +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
39df8b0bb9 [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: Iaa37c939eaff86408e7256ecbc6bc1ca1b4125eb
 2021-06-28 19:29:09 +00:00
TreeHugger Robot
4c3d565029 [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: I40ea65402827869e490499086ee2ee6836a5a3f8
 2021-06-28 19:28:55 +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
4dcaae38c6 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: I00c986d6951cdb6177c0638d1f4fab5477de6660
 2021-06-28 17:52:08 +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
93b716660e 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: Ia8428ecdc0f9c5ef0f3130b58ab9a099c3033146
 2021-06-28 13:03:30 +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
26af8823ef 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: I988673df4227bfae943eea3df6b9de49a5e28364
 2021-06-28 10:15:39 +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
80d8aaad3d [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: I42a6ad11e692ffda53b86b78ca8edb1a9dd3fc29
 2021-06-28 07:28:03 +00:00
Hugh Chen
d5b07b03d1 [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: I131999e135f1965bafe5b9aa67f5d737b869491f
 2021-06-28 07:27:59 +00:00
Hugh Chen
aff7f97f8c [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: If5378005cf7a5445c24748a4aa07e0b539cec352
 2021-06-28 07:27:54 +00:00
Hugh Chen
a3c7b58697 [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: Ib708132f72b1eff81c443f2163c8783b9a6fd59c
 2021-06-28 07:27:50 +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
afcfd0ee07 [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: Ied8291f205c9e341b457b4664cffc4fc67444275
 2021-06-28 06:58:15 +00:00
Hugh Chen
3277eb0407 [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: I5a89995984d9d1d0d16af66f3cfb4f7af9c2c20e
 2021-06-28 06:58:11 +00:00
Hugh Chen
948887231a [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: I82bc75b0e0d6d36260673bc144a84b56f3e58541
 2021-06-28 06:58:07 +00:00
Hugh Chen
12e2f40371 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours am: 8b9dbd066a -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: I2ec23cc754fa2805e14112119e76a0e106d085e4
 2021-06-28 06:58:00 +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
4d49ac0837 [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: 985d52d0c6 -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: I336e4f83f9f420a7d836a5f99fa4fe0ea9ed022d
 2021-06-28 06:48:55 +00:00
Hugh Chen
ecfff8b79b [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: eb41b62299 -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: I4554d36ccd68b745d89510355d603db8c21c99b3
 2021-06-28 06:48:51 +00:00
Hugh Chen
b03a49d16e [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: 7f4a301b88 -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: Id555101d62269b28fa0f8fbfd636f3212824d03c
 2021-06-28 06:48:47 +00:00
Hugh Chen
f047ed0a50 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours am: 3e51c20e21 -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: Ibce4e5f127501d883fcf198bd4d5799880c56993
 2021-06-28 06:48:44 +00:00
Hugh Chen
4695948372 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours am: ff719d5bd8 -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: I2a1613222b6ea6a555645322d1f2ab14f6b78235
 2021-06-28 06:48:40 +00:00
Hugh Chen
0826507b60 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -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: I829135ca573638995c6319ffbc4418bba84affc4
 2021-06-28 06:48:37 +00:00