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

120886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2dfc20bb43 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: If6222c00ef5746db591519644f8a4b70853233a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:15:00 +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
f38b8aa4c1 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: Ie517a41e5e5f80f1fb81c037af235d0aac0bb699
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:26:11 +00:00
SongFerng Wang
53255717ca 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: I1f6c815adae2fbe8ee0ae09e60ab18137a89da18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:25:45 +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
ff5badcecd 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: I999e83a1de7a66111ae493e1fc976a88119897d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:13:32 +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
91f72db16a 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: I46094521cb3171f1444b7fe8387e95e009df486f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 08:55:39 +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
42fc665f48 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: I73a880ba338b997595638fb615d37745c86c595e
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
510b9b6b49 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: I066acb89131eab600688f44758288d75e68a0bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 04:57: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
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
Xin Li
b893175b4b [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: I8974e6379744d31f0b43227d25021f773c6efc78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 01:09:56 +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
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
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