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
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
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
6113725b61
Merge "[Settings] Improve logging to support issue triage" into udc-dev
2023-03-01 03:59:03 +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
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
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
Avinash Vadlamudi
564097499b
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c
am: 2838dde36e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347
Change-Id: I044a1fdcbef2688c96e1ea575a9680dcbc30d28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 22:26:35 +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
50e4c2021a
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c
am: 169c050db8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347
Change-Id: I364f6a0bf67de19138a34e3a8a4471c22c598b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:43:34 +00: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
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
abf7114262
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
am: 333d957462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: I6d31d214e5c3521e29ef8b2b7bc8d9ca51028f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:03:59 +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
TreeHugger Robot
84ac180e39
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
am: 5c5d11a4c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: Iaa9863b32dfe3d7b422231ad7bef8c7337c8d02b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 20:07:44 +00:00
Chaohui Wang
9524c65a29
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
am: 68e47490d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: If85b0e7218e2a54c1a5be8a5667c03178a0f19bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:59:30 +00:00
Chaohui Wang
66c1337ec4
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
am: 55204b9224
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: Icf7c6ef483b9f2e535dac154c7aae5b10810d03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:56:33 +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
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
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
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
Andreas Miko
f2dcb42f5f
Merge "Add setting to disable PIN animation and password"
2023-02-28 17:37:07 +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
TreeHugger Robot
7e9d6e7d22
Merge "Refine FingerprintEnrollmentActivity" into udc-dev
2023-02-28 12:58:53 +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
9e364dcebf
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
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-02-28 10:30:28 +00:00
TreeHugger Robot
a9385841bb
[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: 1b34eb83ea
-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: I3bb6f0dcc559a94d30d3a7d91e26f0d9634d7381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:42 +00:00
Bill Yi
523e1795e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours am: 6b8e4c701b
-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: Id11ad5d740e7e203abd3e031b5bd3bc85ab022a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:36 +00:00
TreeHugger Robot
367d91ef3b
[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: 37d176a317
-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: I72323038b0c4f3a3b9d52e40552be4405f69075f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:29 +00:00
Bill Yi
f3ddacca40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours am: c693b4db1b
-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: If716aa7a6703df24d622df965d6b7134c468da67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:15 +00:00
Bill Yi
b141156feb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours am: c9832aa578
-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: Iec97c6673c19cfb4717a641c117480c4702db650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:04:53 +00:00
TreeHugger Robot
c45b463b05
[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: 5d80437ceb
-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: I08666f546bc55fd4b0f2e346c0d92e7478f8c2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:14 +00:00
Bill Yi
263c5c5336
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours am: 12a74965ba
-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: If7f37ceaaa56a015ce781f584dcc59c28a9edf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:12 +00:00
TreeHugger Robot
2f43390bac
[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: 6e5e22c0a5
-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: I445adb22ce424786aea622a9b8faf1c4729b7df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:06 +00:00
Bill Yi
59def3ffc7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours am: 9de21738be
-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: Id06ca3e623d9f15bcb85b81a898ac0737ecb2b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:00 +00:00
Bill Yi
3af6a83609
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours am: 3e8d456279
-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: Id9d7f7d43d9ad2d68c6ebbbbb61944fca3e46a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:52:23 +00:00