TreeHugger Robot
05da9199bd
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475
Change-Id: I109e6ac5d761f9a246991b34e4434bbf951b3d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 09:13:34 +00:00
TreeHugger Robot
bec6e40dd3
Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev
2023-03-15 08:55:50 +00:00
Daniel Huang
fd695cd189
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546
Change-Id: I537e15066169748cc3a024383c3e164f55eb08d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 08:55:44 +00:00
Daniel Huang
f826b3f427
Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev
2023-03-15 08:15:07 +00:00
tom hsu
97821a7317
[Regional preference] Make prerference and fragment title are same.
...
Bug: b/272440256
Test: Manual test passed
Change-Id: I0d5ce8f55977ce6fc300b28501f98f4860031380
2023-03-15 15:35:34 +08:00
Jason Hsu
b6a359d888
Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662
Change-Id: I4bf2d8d32cce70e63990e01a0c2ffb6a1e30ebd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 07:05:15 +00:00
Jason Hsu
7ab852b48e
Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev
2023-03-15 06:25:13 +00:00
Tom Hsu
5fb635e82d
Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842
Change-Id: I46c61d49106859d425f00531585e6ff61ed90545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 04:56:16 +00:00
Tom Hsu
29bcb4d553
Merge "Add Regional preference UI for Physical keyboard location." into udc-dev
2023-03-15 04:21:02 +00:00
tom hsu
397f06abff
Add Regional preference UI for Physical keyboard location.
...
Bug: b/271805730
Test: Maunal test.
Test: atest passed.
Change-Id: Iab4351c158d6cf24d1a5aa1307ef0182eec522ae
2023-03-15 12:10:21 +08:00
Xin Li
a0c2293966
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Ib9e683f00be13412e96201e23ad2d731ea2fea73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 01:12:32 +00:00
Xin Li
9a78f43bb0
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I3fd9e49e82a926a72fb3aabf5f36ad68b36ef662
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 01:10:37 +00:00
Xin Li
b17a40e1ae
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Ia2e022464f75ae3c2987737a53291c7d03091ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 00:08:04 +00:00
Xin Li
8ef1a9a1be
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I211d2ed66eaef41adf6c905a2998c2405c4be05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 00:06:07 +00:00
TreeHugger Robot
712129d759
Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21964743
Change-Id: I601a03aa2ad1b8a0776a9b1623c96ebf374856df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:23:41 +00:00
Lucas Silva
18b58726dc
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191 am: d17cb44367
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: I3c5bbcbeedf8150559666a5360671f38e87d9179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:20:40 +00:00
Xin Li
7e131d0b94
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Idf60779f799c604ace73767b0483a609e861b9e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:08:02 +00:00
Xin Li
8d7a6eb577
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I4932292d3c8047b7eddac3c878e5f237ba510a80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:06:01 +00:00
TreeHugger Robot
e87159a591
Merge "Merge credential manager providers by package name" into udc-dev
2023-03-14 22:55:34 +00:00
Lucas Silva
d17cb44367
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef am: 5671ddb191
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: Ib9e3e0effc2f486a15c4caec31bdecde0f358029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:39:31 +00:00
Xin Li
dc399ade52
[automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: I35578d54aa72f7abf031eba8873a14e4ccf9a54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:35:18 +00:00
Xin Li
d19379e607
[automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours
...
am skip reason: Merged-In I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0 with SHA-1 77a23c9ce2 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2487246
Change-Id: Ideb892316ec21740723c3d5f06a1b3904f34c3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:32:04 +00:00
Lucas Silva
5671ddb191
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: I4ba691553814eeb5b2b73f3b9665829db905de10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:54:01 +00:00
Lucas Silva
148f1592ef
Merge "Add home controls button to screensaver settings" into tm-qpr-dev
2023-03-14 21:47:03 +00:00
Xin Li
19ca5d6a6e
Merge "Merge Android 13 QPR2"
2023-03-14 21:40:40 +00:00
Behnam Heydarshahi
3135bc59e0
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece am: a1daad718e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I560471fe2df61a2e83d39f0d8e32f1bbfc11cba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:26:44 +00:00
Becca Hughes
0e6d91b778
Merge credential manager providers by package name
...
As part of the spec'd design we should merge providers
by package name this means that if there are multiple
providers they will be all turned on/off together.
Bug: 266772233
Test: make & atest
Change-Id: If7eec7d9a79a97ac3ec4f55b7cbcfaf7748d5750
Merged-In: Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928
2023-03-14 20:28:03 +00:00
Behnam Heydarshahi
a1daad718e
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976 am: afb4dd1ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I38f7acc1b1c5cbb08432d6e3b3229305da381379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 20:22:07 +00:00
Pavel Grafov
c1a5e8e790
Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695
Change-Id: I2c9b00b9e82001b49a8b52e7178baca6ce7d9995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:47:55 +00:00
Behnam Heydarshahi
afb4dd1ece
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: I60aab9b333efc5d38f0cbc6f3635948bf734091f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:43:25 +00:00
Pavel Grafov
7d91a4916d
Merge "Show work lock confirmation in a task overlay" into udc-dev
2023-03-14 19:41:30 +00:00
Behnam Heydarshahi
17701cd976
Merge "Extend settings panel under navigation bar" into tm-qpr-dev
2023-03-14 18:54:48 +00:00
Andreas Miko
19191a0a0b
[automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42 am: 51cb60cc7c -s ours am: dc03dfc013 -s ours
...
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b19 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281
Change-Id: I7c64b776cf2bd63f6c9686e6a9e45af516049f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:16:46 +00:00
Andreas Miko
dc03dfc013
[automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42 am: 51cb60cc7c -s ours
...
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 387b788b19 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281
Change-Id: I24d4c99e04622a89a8203d8572f0cfcce963d0f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:08:17 +00:00
Andreas Miko
51cb60cc7c
Add setting to disable PIN animation and password am: 30bf66db42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21369281
Change-Id: I39f9675c5b3fc234608882780a62141061bf1e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:05:35 +00:00
Matías Hernández
61087cda06
Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572
Change-Id: I1d8888bdb05699472f6a4ef15cdbd544f7ae776f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 17:11:08 +00:00
Matías Hernández
239176684e
Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev
2023-03-14 16:57:58 +00:00
Julia Reynolds
fff542b5dc
Merge "Don't show NLSes with excessively long component names" into udc-dev am: 4726d0de52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888167
Change-Id: Ic20efe366e48e6132dca9a932156281304661f37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 14:49:44 +00:00
Julia Reynolds
4726d0de52
Merge "Don't show NLSes with excessively long component names" into udc-dev
2023-03-14 14:47:55 +00:00
Matías Hernández
77c0dd9469
Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564
Change-Id: I8b76b13b3db3451825bad5c43114cdaec3583b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 13:17:12 +00:00
Matías Hernández
bf2b85bf46
Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev am: ebde211060
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986562
Change-Id: I6729ad74bcc597ef8bbb18b5c13c1c5dfda5f227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 13:16:37 +00:00
Matías Hernández
55a91dda13
Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev
2023-03-14 12:46:49 +00:00
Matías Hernández
ebde211060
Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev
2023-03-14 12:46:38 +00:00
Neil Fuller
c82275d5fc
Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502
Change-Id: I2dea6950d3a19a2b60d99a8b08800316ccc1768c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 10:29:44 +00:00
Neil Fuller
3e34c99502
Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev
2023-03-14 09:50:45 +00:00
TreeHugger Robot
19aee83def
Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043
Change-Id: I67456274cd18c338c87b9ab560e3e0e0b918ae7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 08:41:53 +00:00
TreeHugger Robot
db7e7d0920
Merge "Put Android Core Apps under System apps" into udc-dev
2023-03-14 08:14:09 +00:00
Zaiyue Xue
7eeace0d2b
Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933
Change-Id: I0e68832a8e10baca409001c83d046821eb60dae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 07:30:25 +00:00
Milton Wu
b0b739a188
Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046
Change-Id: I927ebd7f4c987994047c702922a70d0576975cf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 07:29:48 +00:00
Zaiyue Xue
ae45b5812b
Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev
2023-03-14 07:08:40 +00:00