PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,859 Commits 1 Branch 0 Tags
e0556abef159666adf0a07033c67b190ea2f4913
Commit Graph

120859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
e0556abef1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours am: 49c4abbf69 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: Ie8240006db442e814bd7bda8c294cb6ef9fc6da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:48 +00:00
Bill Yi
fadbd56e46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours am: 3fe085e762 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: I44fdc6a9195edb3d7b43c979e3d13f3e416e6021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:42 +00:00
TreeHugger Robot
695531169d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -s ours am: 29827c0b25 -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: Id5a6262936dc0c11ed6d8ebf787967af2d9a1f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:27 +00:00
Bill Yi
eaa0f14003 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -s ours am: 9db3fa17e0 -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: I0a34c2a6d107c606aece9baef384ef24a291435f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:43:06 +00:00
Michael Groover
b746d0a6c5 [RESTRICT AUTOMERGE] Add isTrue to assertThat statements in CredentialManagerPCTest am: 5b5da43ef8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22102862

Change-Id: I96e8a6ce9289063546d9a3e093f9b27aa537b77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:35:05 +00:00
TreeHugger Robot
49c4abbf69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours am: bc3053ca51 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: I1cb6df101c5d3a150d62ef1d333900a5bddb35ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:37 +00:00
Bill Yi
3fe085e762 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours am: 350628d706 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: I26a8ef0a711e15f9f452a8c1912f4a4ff1f6fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:32 +00:00
TreeHugger Robot
29827c0b25 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -s ours am: 053aec9616 -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: I5cc6aaa53dac09a10f7e3e5d4253f3b26069362a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:22:16 +00:00
Bill Yi
9db3fa17e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a73552148b -s ours am: 89ec1ab87e -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: I347e6418c56cccb6a3aaee67dda7392ec0de0ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 22:21:56 +00:00
TreeHugger Robot
bc3053ca51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 827333d9b6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: I1ad68d1100681f6df21668d62485f9f29f9c4d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:45:00 +00:00
Bill Yi
350628d706 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1de90287e1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087793

Change-Id: I59b1204fb9eba20091d3033860819796c1ca58a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:44:57 +00:00
TreeHugger Robot
053aec9616 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 70bb56cb83 -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: Ia29ddec60f6c08bf86280b31f3329f9327cc0d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 21:44:47 +00:00
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
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
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
Julia Reynolds
c410a2c9ae Merge "Don't show NLSes with excessively long component names" into tm-qpr-dev am: 7626600bbf am: ce0c1c4de7 am: 4d1535441e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22066389

Change-Id: Ic1210a586808bfb8080e17f6ecfd5ec69b7e3be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:09:15 +00:00
Julia Reynolds
84671635cb Merge "Reduce jank when revoking notification permission" into udc-dev am: 068a55384b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21888168

Change-Id: Ib8b029ddfcd77aa82c94c698fb7e2830014bdcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 15:07:36 +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
54fffdc6ec Merge "Click the search result "System Sounds" will crash the Settings app" into udc-dev am: 9f29b957e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21974622

Change-Id: I57f2f6fcedac3abfc8dd65d70ea9b85e5244b10b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:15:50 +00:00
TreeHugger Robot
59b7f47307 Merge "Hide Dock speaker plays from sound pages" into udc-dev am: df5bbc630d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21955162

Change-Id: Ib02077e90eb31f378ce1fe54d99ec408dea8e18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:15:27 +00: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
Matías Hernández
be3c8b66ba Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

Change-Id: I580fb71a42be1e400596c62425334b8ab5433d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:26:32 +00:00
SongFerng Wang
ea5a05780f Merge "Avoid ANR when UI query network selection state" into udc-dev am: 40cf9a2132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087477

Change-Id: I730250b01635eb082650d5de077975ace509b540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:25:41 +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
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
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
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
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
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