Bill Yi
27cafd0dfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours am: d3fa508918
-s ours am: 858813dc33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I0733f27db5216ae2f078675b2f3624c1743ff808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:46:25 +00:00
Ahaan Ugale
9cc184e3cb
Merge "Update Autofill OWNERS" am: e35606efd3
am: b238ee99cc
am: 96cb0fb4bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ib174d04d8027e92e649d171cd02bfebc9d7aa94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 13:41:12 +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
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
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
Jason Chiu
771a0c0473
Eliminate the injection flicker while navigating back
...
For the title/summary uri, do not set the placeholder when it already
has content. This can avoid clearing the text before re-rendering.
Test: robotest, visual
Fix: 256657256
Change-Id: I0518f5247fd2acf6a5eaa63f0f363275103a79af
2023-03-01 10:02:35 +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
menghanli
fdc9a1b896
Fix ClassCastException when users starts A11y vision settings from out of setup flow
...
Root cause: Launch A11y vision settings from out of setup flow would not apply setup wizard theme (SettingsPreferenceTheme_SetupWizard). This throws ClassCastException when converting the layout to support auto-switching two-panel pattern.
Solution: Only converting the layout if launched in setup flow.
Bug: 269267419
Test: Manual testing by `adb shell am start -n com.android.settings/com.android.settings.accessibility.AccessibilitySettingsForSetupWizardActivity` for out of setup flow cases & 'adb shell am start -a android.intent.action.MAIN -n com.google.android.setupwizard/.SetupWizardTestActivity' for setup flow.
Change-Id: I16871b2fa800dd1de539b7b4b96c32ce7b2cd5c9
2023-03-01 16:38:45 +08: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
c5054d5907
Merge "Disable MTE developer option if device config overrides it" into udc-dev
2023-03-01 06:21:23 +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
6113725b61
Merge "[Settings] Improve logging to support issue triage" into udc-dev
2023-03-01 03:59:03 +00:00
Bill Yi
8ff2cfceab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours am: ea2310e0fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia395d0639b6ba51a171f6ec171901820471a7488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:38 +00:00
Bill Yi
cec67a1ee1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours am: 960eae9a2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia7b0d7129c92afe7bfbebf9ae700e30e33ea70d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:35 +00:00
Bill Yi
3ba3148e2f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours am: 71ad7ad49e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ib615b16b5c9c5246007ba354fe3544babc30b19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:33 +00:00
Bill Yi
75304e1ff5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours am: 9de8ff63dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Id37e5fd08583efac8b1c1a3d513ef4664b71750a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:25 +00:00
Bill Yi
3d4d0267c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours am: cac65afe79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If1b14926b3701b36b0720c264cae94087d17ed75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:09 +00:00
Bill Yi
858813dc33
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours am: d3fa508918
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I08f758e7ac7349eea06ec2ddca2663507d774bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:04:41 +00:00
Bill Yi
ea2310e0fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia4c3858ec103f63ee8da598b5263c32aa12c2214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:35 +00:00
Bill Yi
960eae9a2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I70efdf826f91370e142e2001bcc787b102125430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:32 +00:00
Bill Yi
71ad7ad49e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I21f3db8861e7bd07d1fb4c4325989425862ebaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:30 +00:00
Bill Yi
9de8ff63dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ic316185ed34b2ba3801f22f7013cca419f30a090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:22 +00:00
Bill Yi
cac65afe79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If1ad768e127f48cb041a2f486e41bd1539c41224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:06 +00:00
Bill Yi
d3fa508918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I173610558cc94901d1b48f39cc99964e5a0a55ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:33:38 +00:00
Diya Bera
5faf4eeb8e
Learn more updated in Fingerprint Settings for side fps
...
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-01 01:13:03 +00:00
Bill Yi
839c6e88b4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
798dd47215
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
586da77594
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Ahaan Ugale
96cb0fb4bd
Merge "Update Autofill OWNERS" am: e35606efd3
am: b238ee99cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I86a993dbc87ab3f7c59dd02b360be4e864d8cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:01:23 +00:00
Julia Reynolds
510cb8f22e
Merge "Make string the same across screens" into udc-dev
2023-02-28 23:30:15 +00:00
Ahaan Ugale
b238ee99cc
Merge "Update Autofill OWNERS" am: e35606efd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I3837d1677ee9769f9dd5ff88d6eedbdaf97b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:23:30 +00:00
Julia Reynolds
20c5853744
Merge "Fix settings crash" into udc-dev
2023-02-28 23:02:06 +00:00
Ahaan Ugale
e35606efd3
Merge "Update Autofill OWNERS"
2023-02-28 22:42:36 +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
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
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