Commit Graph

120475 Commits

Author SHA1 Message Date
Bill Yi
0117365350 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -s ours am: f0b1e40b86 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6cb6a78b37741de3e4a1c0fb4dbe90e9590d3ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:18:15 +00:00
Bill Yi
dc34bb4d61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -s ours am: d4f79a3237 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb1ece6df3315e5a44ad068fd47c5ca43e951554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:17:59 +00:00
Vincent Wang
0c94e742b5 Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev am: 9c57255b39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659502

Change-Id: Ib140e660eea9036bb873cc0bb2e71ea55ebb9eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:07:23 +00:00
Bill Yi
f0b1e40b86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5475d2495e36f4e3d71674da0c4a75c1b8832653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:05:16 +00:00
Bill Yi
d4f79a3237 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I088f64f5800182407977b482021b25c509fe40ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 13:04:49 +00:00
Vincent Wang
9c57255b39 Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev 2023-03-01 12:58:10 +00:00
Andreas Miko
0d883efab0 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: I6653e57561da90f6cb4b39ce2095755d1bdb1105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:52:15 +00:00
Chris Li
3eb64058b2 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: I9bcdc517ba6a56af380d913f334a100a93046096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:49:39 +00:00
Will Leshner
205adf930e [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: I8eb11896745666b11a8b5b9fb014145da347d55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:49:24 +00:00
Natnael Belay
9362fb4f42 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: I4df0e896427ab24cf7ab5a261719fba833f0c127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:49:07 +00:00
Steve Elliott
8af89d5d21 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: I00befad0d6bf0dbf5f99828bafde3fc91a775d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:48:26 +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
Darrell Shi
b319e78682 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: I0181f593e0b76bbccef1c724a9dc2045e521b114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 12:29:32 +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
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
0e5068fb58 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: I4c8fd5ae3709aa93fa269e93eac09ce0be0bb570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 09:57:21 +00:00
Vincent Wang
b7e04a59a8 Fix Different layout between v2 enrolling and original enrolling page
Bug: b/271210305
Test: 1. adb root
      2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
      3. Enter fingerprint enrilling page
      4. Rotate device to 90 or 270 degree
      5. Change the roation to 270 or 90 degree
Change-Id: Ib495bd281a208f0c13707ef6e3ed402ac418b8b6
2023-03-01 09:13:42 +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
6fe481b424 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: I33d87ecc4efe5ac2364f4068ecca4e19a0c4b17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:34:53 +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
bd1715e012 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: Icb6a711c9547e3cc43d504fba64259ad08c7357f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 06:14:53 +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
9e7ab494df 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: If3c21b526d512ea7c23ec89ca595f94f1b766b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 04:40:05 +00:00
Bonian Chen
6113725b61 Merge "[Settings] Improve logging to support issue triage" into udc-dev 2023-03-01 03:59:03 +00:00
Julia Reynolds
24131b83e7 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: I836dfcee1df32aa69f6f2ce8948136920e06ca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:54:26 +00:00
Julia Reynolds
218310af06 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: I89c5d6dc687e2929cedd0e6a47461a91287d1776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:53:57 +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
Bill Yi
118faadcb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20707402de4333b6c20b6cf564d5cff1e706397a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:34:59 +00:00
Bill Yi
b710a96e76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I734c5e24a8d70c11cc66edcd2da368f2ccf9486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:34:23 +00:00
Bill Yi
64fd489c13 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-28 22:15:39 +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
Avinash Vadlamudi
2838dde36e 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: Ida2ec570ce03146046925733a6971e5ca6a70b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:42:11 +00: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
TreeHugger Robot
333d957462 Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900

Change-Id: I54985ba7d58ada0a2f14604599221e6e609d9e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 20:48:07 +00:00
Chaohui Wang
68e47490d6 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: Id4602df190b9ce51ad688635772662b27f673289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:47:17 +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