Andreas Miko
9d61cc28cc
Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591508
Change-Id: Ibb99c65c9d999fcc655790b36a380e7778ab56e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:09:37 +00:00
Chris Li
ba3231c762
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd am: 2bde9085dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: I64d8463fef76c39d05ff3c7b36ee38223e86b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:08:13 +00:00
Will Leshner
c8c2cb0d6c
[automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1 am: 554fe689fa -s ours am: 5a7e38ee6c -s ours
...
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: Ia889cb9df9929b36c60ca9b612ec66d2925e9581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:08:04 +00:00
Natnael Belay
b50ad1c806
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e am: f89a6c2ed4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: Ieca7a07dbb71a907d71c4fdaec1c78a8992bd063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:07:53 +00:00
Steve Elliott
23cf83b75a
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 am: 97ee8a8414 am: f6955e43d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: I89aa70fe8d23e528fc87b5add38b43c7abb3bf6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:06:51 +00:00
Andreas Miko
8b71dc930d
Merge "Add setting to disable PIN animation and password" into udc-dev
2023-03-01 12:46:04 +00:00
Chris Li
2bde9085dd
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: Ia7bf3e93b642f7a3306b17aec823436e42c2e804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:16:15 +00:00
Will Leshner
5a7e38ee6c
[automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1 am: 554fe689fa -s ours
...
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I623dfed9918b7d101e790d28825b9fd8c9f9864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:16:07 +00:00
Natnael Belay
f89a6c2ed4
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: I546352a44aaf525b9819f59337658f3abdd8f77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:15:34 +00:00
Darrell Shi
987f62322b
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3 am: 8ba70d32e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I46e98a31a803cfeb4f48fd50a3df0f1d34e3a3e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:14:18 +00:00
Steve Elliott
f6955e43d7
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11 am: 97ee8a8414
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: I36e13e98689832aed10256e708e28082b6d00f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:14:18 +00:00
Darrell Shi
8ba70d32e2
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94 am: d8f61dc2a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I097729dd0420387e67d8aa7eba9642c4834330d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:12:28 +00:00
Vincent Wang
2e3848a71f
Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267
Change-Id: If2711dc3712d0c1c9f22c13c7240fee7bea7e9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 09:57:29 +00:00
Vincent Wang
8e3c46b1c9
Merge "Fix UDFPS enrolling crash" into udc-dev
2023-03-01 09:12:38 +00:00
Vincent Wang
f2db627a7c
Fix UDFPS enrolling crash
...
Bug: b/271208595
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Record fingerprint
4. Check setting work normally
Change-Id: I69cc50cd677e80a57bb430a5a295c46b519d7755
2023-03-01 07:43:04 +00:00
TreeHugger Robot
e16f187522
Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548006
Change-Id: Ifedab9f51f972831a95033aefdf6656c1519c441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:34:20 +00:00
TreeHugger Robot
c5054d5907
Merge "Disable MTE developer option if device config overrides it" into udc-dev
2023-03-01 06:21:23 +00:00
Chaohui Wang
a0b2938145
Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180
Change-Id: I62e52af060a36c88fed59375fe1d3129d357591e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:14:33 +00:00
Chaohui Wang
f74d6003ff
Merge "Fix App Info item summaries not refreshed" into udc-dev
2023-03-01 05:47:06 +00:00
Bonian Chen
6a291f51fc
Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741
Change-Id: I68c196ba149d1fa5e9ad3ec4540f7e3e777fab8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 04:39:41 +00:00
Bonian Chen
6113725b61
Merge "[Settings] Improve logging to support issue triage" into udc-dev
2023-03-01 03:59:03 +00:00
Bill Yi
7ef6dedd46
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-01 00:49:32 +00:00
Bill Yi
4798986201
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-03-01 00:49:32 +00:00
Julia Reynolds
6a5a753fb2
Merge "Make string the same across screens" into udc-dev am: 510cb8f22e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119
Change-Id: I7f39147624496dfcb913ae13116db57fe0adfec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:44:17 +00:00
Julia Reynolds
fbcd40d274
Merge "Fix settings crash" into udc-dev am: 20c5853744
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756
Change-Id: I2279f891c8eeec33e43bc19460a57c5136e2eec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:40:51 +00:00
Julia Reynolds
510cb8f22e
Merge "Make string the same across screens" into udc-dev
2023-02-28 23:30:15 +00:00
Julia Reynolds
20c5853744
Merge "Fix settings crash" into udc-dev
2023-02-28 23:02:06 +00:00
Julia Reynolds
e75dfc6f05
Make string the same across screens
...
Test: view notification settings
Fixes: 245912213
Change-Id: Ifb1966a2102afa38ed00bb81e08bbd1b92123a55
2023-02-28 17:10:24 -05:00
Chris Li
74f07a89bd
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: I80f5c1e6a44e6ea4d73d6fbd0fad83ad3be4c0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:40:35 +00:00
Avinash Vadlamudi
169c050db8
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347
Change-Id: I6a9665500447f329bf63806a3a07cc63a7edeaa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:04:00 +00:00
TreeHugger Robot
5c5d11a4c2
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: I8462e18120d33429dbd931792a9d81f6a5f9a43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:47:41 +00:00
Chaohui Wang
55204b9224
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: Iad2fec07b257570ac6f6195bc0ed8d187337aa4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:27:21 +00:00
Will Leshner
554fe689fa
Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I20b547eb56aac56837de97473671d902b2e524fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:12:43 +00:00
Bonian Chen
62e934a039
[Settings] Improve logging to support issue triage
...
1. Avoid from deprecated warning log
2. Add targetting subscription id into log
Bug: 271126362
Test: local
Change-Id: I6eac2032cc29b193dab009626a9824ee4fb451f5
2023-02-28 17:56:35 +00:00
Chris Li
77a23c9ce2
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248 )
(cherry picked from commit 1092486873 )
2023-02-28 17:13:39 +00:00
Avinash Vadlamudi
019ce4c02c
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev
2023-02-28 15:10:27 +00:00
Natnael Belay
c6049dfa4e
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp
2023-02-28 14:51:50 +00:00
TreeHugger Robot
7e9d6e7d22
Merge "Refine FingerprintEnrollmentActivity" into udc-dev
2023-02-28 12:58:53 +00:00
Steve Elliott
97ee8a8414
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: Ia7757a15bc4d4796fc7d573cc59b488453527038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 12:48:22 +00:00
Darrell Shi
d8f61dc2a3
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I404de08142653608ff054be43c70d4323b063861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 12:38:18 +00:00
Avinash Vadlamudi
7da92e9295
[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state
...
- Save and restore the autoPinConfirmOptionSetManually field during activity restart (because of orientation change)
- This helps to retain the state of the auto confirm unlock checkbox during an orientation change during set PIN stage.
Bug: 268592440
Test: Manual Test
Test: atest ChooseLockPasswordTest
Change-Id: I48ce9080b6007fb4e3a5ca5013d6c21ed4ba664f
2023-02-28 11:54:16 +00:00
Chaohui Wang
e34d95d68e
Merge "Disable the middle pages during development" into udc-dev
2023-02-28 11:43:05 +00:00
Chaohui Wang
f46cdad05d
Fix App Info item summaries not refreshed
...
On tablet, "Open by default" & default app shortcut not refreshed when
settings changed.
Changing from liveData to flow fix this issue on tablet.
Bug: 236346018
Test: Manually with App Info
Change-Id: I6e3a174bdbecb154e39e111ecf695b1146c484df
2023-02-28 19:37:55 +08:00
Andreas Miko
387b788b19
Add setting to disable PIN animation and password
...
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Merged-In: I587b993ef5515a075442e82ebafae88bebdffc20
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-02-28 10:29:58 +00:00
TreeHugger Robot
5d80437ceb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours am: 488d3adb81 -s ours am: de10018301 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I70b6280d4b43da60dd2b4af200f04e2ad992cbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:29 +00:00
Bill Yi
12a74965ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c -s ours am: 934826d8d3 -s ours am: 0f86c524c8 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I44beba09fcaff9c0d6d7b5de4879d9781c9e98dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:21 +00:00
TreeHugger Robot
6e5e22c0a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642 -s ours am: 62a6197006 -s ours am: 98e097b2e6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I79b712d8dea6ad2f66600ef28a2f1d3e1afe4d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:16 +00:00
Bill Yi
9de21738be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a -s ours am: 47d7d69611 -s ours am: 49c2652453 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I7db0e8366e5f1d3b963a19be1265fa41a8855323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:59 +00:00
Bill Yi
3e8d456279
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1 -s ours am: 5d6536ce44 -s ours am: 8f600b3932 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: Ica41031b95d61fb60cbf20f1a8a826db19b7679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:40 +00:00
TreeHugger Robot
de10018301
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e -s ours am: 488d3adb81 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: If39365a1964c49b7ee609fe0f88f6b5dce6bc9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:40:01 +00:00