Bill Yi
89ec1ab87e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22086176
Change-Id: I61380c2773ea05dcac939334bad338e4dd8c52b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:44:10 +00:00
Dmitry Dementyev
9bec974991
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
am: 7f73a168fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: Ia0bfeee6be995a2df857147a0aadc17f41672d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:34:39 +00:00
TreeHugger Robot
827333d9b6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
TreeHugger Robot
70bb56cb83
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-03-15 21:24:10 +00:00
Dmitry Dementyev
7f73a168fe
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
am: 4f67ca0cfa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I4815a1e5e05bcee661a8ce037a2671086d16faee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 21:01:01 +00:00
Dmitry Dementyev
4f67ca0cfa
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
am: 32813a2bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I887d715a24724806bf20808ca91b6ed23d492b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 20:19:04 +00:00
Dmitry Dementyev
32813a2bef
Convert argument to intent in AddAccountSettings. am: c7e8052b52
am: f56584cd21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I859c957eb1f94bd9c5858b71c551a1e2e10b0468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:39:21 +00:00
Michael Groover
5b5da43ef8
[RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest
...
Change-Id: I34f808bc497971aa53fc7842159795d8407ed113
Fixes: 273763249
Test: atest CredentialManagerPreferenceControllerTest
2023-03-15 19:28:36 +00:00
Dmitry Dementyev
f56584cd21
Convert argument to intent in AddAccountSettings. am: c7e8052b52
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21872485
Change-Id: I83ab1d878491552ccb3ea1545742d1915fd8a6f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 19:01:57 +00:00
Bill Yi
aef5e4d513
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 10f88f394b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22084583
Change-Id: Ic930418914a624eefdcb9094c3684e76f2f170d1
2023-03-15 16:58:00 +00:00
Bill Yi
6484f81d9e
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 787231f181
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087425
Change-Id: I462ed789b5300979b9e8bd61a548f1dee85a7ca9
2023-03-15 16:57:59 +00:00
Julia Reynolds
4d1535441e
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
am: ce0c1c4de7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I03d1f3a7b40598abfa3bbd1fee85b457a471acd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 15:00:44 +00:00
Julia Reynolds
068a55384b
Merge "Reduce jank when revoking notification permission" into udc-dev
2023-03-15 14:50:07 +00:00
Julia Reynolds
ce0c1c4de7
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389
Change-Id: I90173ce86cc356ba97e4ff51dffd6b6588bb0c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-15 14:27:39 +00:00
Julia Reynolds
7626600bbf
Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev
2023-03-15 13:59:23 +00:00
Julia Reynolds
a331c50b53
Reduce jank when revoking notification permission
...
-Reorder fields so the appear/disappear more cleanly
-Remove some divider lines- they don't animate with the content, for
some reason
-Remove an unused field
-Hide the badge field (remaining field with divider) if there are no
channels
-Change style of 'Notifications are blocked' field to better match
the other fields
Test: revoke notification permission for apps with and without channels
Test: BadgePreferenceControllerTest
Fixes: 233962859
Change-Id: Ife894172bf91d838edf3b0546c5ee00e206a855f
2023-03-15 09:08:10 -04:00
Jason Hsu
9f29b957e7
Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev
2023-03-15 12:00:37 +00:00
TreeHugger Robot
df5bbc630d
Merge "Hide Dock speaker plays from sound pages" into udc-dev
2023-03-15 11:52:38 +00:00
Mill Chen
a860bf3220
Hide Dock speaker plays from sound pages
...
In order to ensure the setting only works on the analog docks, adding
the docking state checks.
Bug: 270492232
Test: manual test
1) Connect to digital dock
2) Check the sound page and the dock speaker plays shouldn't be
displayed
Change-Id: I1dc1e0aac8b9067ec8f5f1defc721294caf2949e
2023-03-15 10:25:32 +00:00
Matías Hernández
2cabe8786e
Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev
2023-03-15 10:12:23 +00:00
SongFerng Wang
40cf9a2132
Merge "Avoid ANR when UI query network selection state" into udc-dev
2023-03-15 09:46:21 +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
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
SongFerngWang
7b9c22348a
Avoid ANR when UI query network selection state
...
Moving the quert network selection state to back ground
and listening the service state to detect the betwork selection
changed.
Bug: 270652395
Test: atest AutoSelectPreferenceControllerTest
Change-Id: I81a597f28cf7ce25ff4eff5100bdb4d29c897a14
(cherry picked from commit 7b80b4ecd9
)
2023-03-15 07:54:06 +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
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
29bcb4d553
Merge "Add Regional preference UI for Physical keyboard location." into udc-dev
2023-03-15 04:21:02 +00:00
Diya Bera
4ffddaa19f
Remove subtitle from biometric prompt in Settings (Passwords & Accounts)
...
Bug: 250064171
Test: Manual - repro according to bug
Change-Id: I5896c3cec13d65093fa928db042952045269b93f
2023-03-15 04:17:50 +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
Bill Yi
a73552148b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idd94e1c8ca5d1a8f1c46786e83d83a3d6b68493c
2023-03-14 19:12:19 -07:00
Bill Yi
1de90287e1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e52a4acd3f0f22fdc54abc909035f70d82173e9
2023-03-14 19:03:27 -07:00
Bill Yi
787231f181
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibd6b3121bd8feaaff3c9d4d83fd3a2cef5e42939
2023-03-14 18:59:34 -07:00
Bill Yi
10f88f394b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5a2a759b2f6a8fe78071ead5fec83fb70359e639
2023-03-14 18:57:46 -07: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
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
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
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
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