TreeHugger Robot
f122de33ef
[automerger skipped] Merge "Merge credential manager providers by package name" into udc-dev am: e87159a591
am: 712129d759
-s ours
...
am skip reason: Merged-In Id48f27e96cabdd8ab0e8cbafc8eb760b7bbbf928 with SHA-1 043ba28892
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21964743
Change-Id: I935a6e7e51d3665a17da27b6a8ddd6a6e25dee37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:57:14 +00:00
Lucas Silva
15d65fcd1e
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
am: 5671ddb191
am: d17cb44367
am: 18b58726dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: Idddab6d7d713cce0e1d0935b29f105bc2ade64f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:45:23 +00:00
Lucas Silva
95d06ff9de
Merge "Add home controls button to screensaver settings" into tm-qpr-dev am: 148f1592ef
am: 5671ddb191
am: d17cb44367
am: c1e0f6f3ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21936019
Change-Id: Ia6d2268fb3ede33f805447fbdf8ed9c7fbd73145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 23:43:16 +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
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
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
Behnam Heydarshahi
04710fc421
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
am: afb4dd1ece
am: a1daad718e
am: 3135bc59e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: Ic810d3df6fbda045d0210a72b6f027af6dfbdb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 22:03:30 +00:00
Behnam Heydarshahi
8e10c8e488
Merge "Extend settings panel under navigation bar" into tm-qpr-dev am: 17701cd976
am: afb4dd1ece
am: a1daad718e
am: 4f3401050d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20929206
Change-Id: Ia429c3c5a8520b540b542a6634316d45f5ca15d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 21:59:55 +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
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
Pavel Grafov
6d963c5793
Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d
am: c16ec1ac55
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695
Change-Id: I739dbe99483ee2326db319a8477e66cce2819012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 20:25:43 +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
400ec55c09
Merge "Show work lock confirmation in a task overlay" into udc-dev am: 7d91a4916d
am: c1a5e8e790
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21851695
Change-Id: Ic162d3bc8f5dc2b7dd6eeb9d45db0476468caf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:51:38 +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
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
Andreas Miko
1cbac1e754
[automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42
am: 51cb60cc7c
-s ours am: dc03dfc013
-s ours am: 779418bb29
-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: Id4c97e3b7b35a69698afaff88952f5750adabd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 19:07:26 +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
07258ef979
[automerger skipped] Add setting to disable PIN animation and password am: 30bf66db42
am: 51cb60cc7c
-s ours am: dc03dfc013
-s ours am: 19191a0a0b
-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: I40b18c6685b0bac08b583aac4fa2daebbbabe8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-14 18:28: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
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