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
f9a8cbe9a2
Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9
am: 0e5068fb58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267
Change-Id: I80b4128890f755c4112372e953d1d3f9fd3488b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 10:52:46 +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
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
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
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
86bd252ec2
[automerger skipped] Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907
am: 6fe481b424
-s ours
...
am skip reason: Merged-In Idd249e060a275b58a399349f202fc68b42964eb0 with SHA-1 65116faa29
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548006
Change-Id: I2b47da0582aa68442e182e50edeebf0822af2cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:51:02 +00:00
Chaohui Wang
06f806f6cd
Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff
am: bd1715e012
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180
Change-Id: I54cf0d02cc52b8c42f61585ddc62b580b95b628a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:50:45 +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
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
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
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
f6bbe0cc07
Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61
am: 9e7ab494df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741
Change-Id: Id5945a74a8519280a6618cf4d28e534ae4f0e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 05:16:02 +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
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
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
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
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
Julia Reynolds
36e0d85039
Merge "Make string the same across screens" into udc-dev am: 510cb8f22e
am: 24131b83e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119
Change-Id: I8ddaba3f5278ef00bb3c275190aa76efc13f7e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:36:38 +00:00
Julia Reynolds
675bf5b563
Merge "Fix settings crash" into udc-dev am: 20c5853744
am: 218310af06
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756
Change-Id: I9529060acc048ff4335caaf3f8f91c1f187b3dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:36:24 +00:00
Julia Reynolds
114cb4df2d
Merge "Make string the same across screens" into udc-dev am: 510cb8f22e
am: 6a5a753fb2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119
Change-Id: Ia59a9edbe2e641cf689224cf334d47ccefc2e754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:21:03 +00:00
Julia Reynolds
dcea6f6768
Merge "Fix settings crash" into udc-dev am: 20c5853744
am: fbcd40d274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756
Change-Id: I3393ded4711252d8b2e868095ea8862349c7b8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:19:42 +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
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
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