Grace Cheng
a796202f11
Update locked device icon in FingerprintEnrollIntroduction
...
Changes locked device icon in FingerprintEnrollIntroduction to be form
factor agnostic
Test: (manual) navigate to FingerprintEnrollIntroduction and observe new
asset
Fixes: 268588691
Change-Id: I747a52319671c7b0f337f0a1c39a529da65b3f43
2023-03-15 01:07:26 +00:00
Xin Li
fc853a6532
[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: I92e7b2bd2aee17dfc8742ab8e93b620ff403a0bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 01:07:09 +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
ebf4e908c2
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: I309fb2ec5a9c26b682cf1086d753ee2d60bc79b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:23:32 +00:00
Lucas Silva
c1e0f6f3ea
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: I62ef3a16f55bad8da006e719c0faf1d63b869535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:21:50 +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
4f3401050d
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: Ifc2c41c7ecf598a1e5e4d3586fbaa4f197da2760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:25:22 +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
Kweku Adams
13f75dcf2b
Remove RESTRICTED bucket off code.
...
The RESTRICTED bucket has been enabled for a few releases and we have no
intention of disabling it by itself at this point.
Bug: 273564840
Test: atest CtsJobSchedulerTestCases:ConnectivityConstraintTest
Test: atest CtsJobSchedulerTestCases:JobThrottlingTest
Test: atest CtsUsageStatsTestCases:UsageStatsTest
Change-Id: I51bfd0b00bb582a839a356e8d926a6d0ca81a683
2023-03-14 20:27:15 +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
c16ec1ac55
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: I3cfbfc23eed16e329f6aeb778aef5f7e702218a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:51:06 +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
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
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
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
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
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
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
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
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
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
3e34c99502
Merge "Fix a crash due to absence of no-arg fragment init" into udc-dev
2023-03-14 09:50: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
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
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
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
Xin Li
d15a2d7e0c
Merge Android 13 QPR2
...
Bug: 273316506
Merged-In: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
Change-Id: I31663f525e4d6739bf511d0a47cfe69d22feeccb
2023-03-13 23:11:28 -07:00
Zaiyue Xue
702921c9ff
Put Android Core Apps under System apps
...
Bug: 269188405
Fix: 269188405
Test: manual
Change-Id: Ie79cdb71c48661b6b1e90b8d0e7836269cf665e7
2023-03-14 13:53:08 +08:00
Zaiyue Xue
f57ae783f3
Change getSystemAppsAllowlist() returns an empty list instead of null.
...
Bug: 265751163
Test: presubmit
Change-Id: Ide8b36345b328d5969b764b6c5e1503904e9ecaf
2023-03-14 13:45:48 +08:00
TreeHugger Robot
00cd454f6c
Merge "Update the font family for panel slice" into udc-dev am: ea58698850
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21938303
Change-Id: If366fb5a2b3840e14308d48c534b392c33291a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 05:41:52 +00:00
TreeHugger Robot
ea58698850
Merge "Update the font family for panel slice" into udc-dev
2023-03-14 05:09:55 +00:00