Andreas Miko
|
779418bb29
|
[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: Ib4d0fc2e0979ff72f0ba232c9011a13e81410bd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 18:28:19 +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 |
|
Becca Hughes
|
dde593c363
|
Merge "Merge credential manager providers by package name"
|
2023-03-14 17:14:49 +00:00 |
|
Automerger Merge Worker
|
220b9a6ead
|
Merge "Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e am: 60ada686f7"
|
2023-03-14 17:13:31 +00:00 |
|
Matías Hernández
|
3d7cc756be
|
Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e am: 61087cda06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572
Change-Id: Ibb3ceaacfbfd3671a3d1d137f38bea8f26a6c4a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 17:13:10 +00:00 |
|
Matías Hernández
|
ef44658a6d
|
Merge "Show correct chevron for "Priority" on RTL languages" into udc-dev am: 239176684e am: 60ada686f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986572
Change-Id: I151df8e4af60d11387e208ffb97266ca2212a3b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 17:13:06 +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
|
60ada686f7
|
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: Icafa108382f45ca6f40b3efb357fe8aa0061effd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 17:06:17 +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 |
|
Matías Hernández
|
0882b04ed5
|
Delete stuff related to removed "Conversations that can interrupt" settings
Bug: 226486181
Test: N/A, dead code removal only
Change-Id: I100db518880a7eee402af37f49e416ec61ff8486
|
2023-03-14 16:53:53 +01:00 |
|
Julia Reynolds
|
394fef661d
|
Merge "Don't show NLSes with excessively long component names" into udc-dev am: 4726d0de52 am: 2d7a4d7ca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888167
Change-Id: I18d1bdb7b45c8b17450656386102816ba7171b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 15:08:14 +00:00 |
|
Julia Reynolds
|
48d752fdc4
|
Merge "Don't show NLSes with excessively long component names" into udc-dev am: 4726d0de52 am: fff542b5dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888167
Change-Id: Ic3a2254d55bc7938f2ae8825ed62bf5616958073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 15:07:47 +00:00 |
|
Julia Reynolds
|
2d7a4d7ca7
|
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: I60a885a15053e905162e5b4ca0331ffb3722f9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 14:52:13 +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
|
a9ccc96efd
|
Don't show NLSes with excessively long component names
Test: install test app with long CN
Test: ServiceListingTest
Bug: 260570119
Change-Id: I3ffd02f6cf6bf282e7fc264fd070ed3add4d8571
|
2023-03-14 14:48:29 +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
|
637c942760
|
Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13 am: c06866227d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564
Change-Id: Ibbb320323929522fa8185220a2516fc2ab2c4749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:51:46 +00:00 |
|
Matías Hernández
|
4887eccedd
|
Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev am: ebde211060 am: b89a9080b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986562
Change-Id: I9d920b394bc69cca625496997aeecf385c19272c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:51:18 +00:00 |
|
Matías Hernández
|
0fc7f8c9d7
|
Merge "Fix icons size in "Add DND Schedule" dialog" into udc-dev am: 55a91dda13 am: 77c0dd9469
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986564
Change-Id: If2db3c4266dcc3acaefe525a06ba5ab46708c70e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:50:41 +00:00 |
|
Matías Hernández
|
e148bda11a
|
Merge "Close ZenModeScheduleRuleSettingsActivity when rule is deleted" into udc-dev am: ebde211060 am: bf2b85bf46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21986562
Change-Id: Ic67427ac1e7162727b261e5308c6dcb312202bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:49:57 +00:00 |
|
Matías Hernández
|
c06866227d
|
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: Ie400da9eef62d1e0ad5d711e194968b434785c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:17:45 +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
|
b89a9080b8
|
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: I51ab1d99857693e3381167720d1edf047a209485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 13:16:54 +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
|
e03e729d14
|
Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502 am: 13c40b99b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502
Change-Id: I01fa6da0d849b294cf1127eeab9bd14021c51fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 11:05:32 +00:00 |
|
Neil Fuller
|
c762f5243e
|
Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev am: 3e34c99502 am: c82275d5fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21958502
Change-Id: Ib90f62226612355b589a869a4da0bfe47ebb6b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 11:03:46 +00:00 |
|
Neil Fuller
|
13c40b99b1
|
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: I50f9dfb65074976ca9b3ae35cae61abc4bcd7d88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 10:30:41 +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
|
8186ddade1
|
Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920 am: 5240e16556
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043
Change-Id: I608635dc7efa111cbf84ebab460feed91126050b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 09:15:15 +00:00 |
|
TreeHugger Robot
|
6650ee11cc
|
Merge "Put Android Core Apps under System apps" into udc-dev am: db7e7d0920 am: 19aee83def
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983043
Change-Id: I5e0791ccb1a3857b6b9bea875055521c3af10880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 09:13:45 +00:00 |
|
Chaohui Wang
|
4b964aa552
|
Move LogEvent action to Settings
Spa cannot refer SettingsEnums, move the action to Settings.
Bug: 269821172
Test: Make Settings
Change-Id: I033f4d046736b109de679e139caac75b3e4071b1
|
2023-03-14 16:46:47 +08: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
|
5240e16556
|
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: Iea678ce10300088b6141bce4a69092a62b44637c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 08:41:49 +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
|
a038241c96
|
Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b am: 22016f28d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933
Change-Id: I0f7e933c3e9faffe4eb65bbf9082a507aa44e88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 08:04:11 +00:00 |
|
Milton Wu
|
238daf4979
|
Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f am: 4a44ba19f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046
Change-Id: I06ebfd4208bbcf5d7625769297f1e01346bc72ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 08:04:00 +00:00 |
|
Zaiyue Xue
|
3d012059d5
|
Merge "Change getSystemAppsAllowlist() returns an empty list instead of null." into udc-dev am: ae45b5812b am: 7eeace0d2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21987933
Change-Id: I3b19e536ab231fc94ec7757e72506a9c93f3aa78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 08:03:47 +00:00 |
|
Milton Wu
|
d3a1030f22
|
Merge "Add biometrics v2 test" into udc-dev am: ea3c207e6f am: b0b739a188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21983046
Change-Id: I9825613ac388bc9557a1c08542da4f6d8df87fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 08:03:34 +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 |
|
Zaiyue Xue
|
22016f28d1
|
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: I6d18a75d568c5b08efdc9212a4c66b9409f15d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 07:30:25 +00:00 |
|
Milton Wu
|
4a44ba19f0
|
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: Ia9dfb1abbc6601fdc00f4ad3d4ff1902deb394ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 07:29:54 +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 |
|
Milton Wu
|
ea3c207e6f
|
Merge "Add biometrics v2 test" into udc-dev
|
2023-03-14 06:53:16 +00:00 |
|
TreeHugger Robot
|
e721532a36
|
Merge "Update the font family for panel slice" into udc-dev am: ea58698850 am: 00cd454f6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303
Change-Id: I85b452c7af60879eb0fb5c91b69ebbfa618ab9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-14 06:16:15 +00:00 |
|