PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,834 Commits 1 Branch 0 Tags
0ff921e245f11a2b0719b53e1a575ef76b726fcd
Commit Graph

121834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Hsu
a14e57b917 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: I63879c27940834f5dfde70e1252c7b3c953af158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:15:45 +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
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
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
88ea5f9dae Merge "Delete stuff related to removed "Conversations that can interrupt" settings" into udc-dev am: 2cabe8786e am: f38b8aa4c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21988900

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

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

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

Change-Id: Ia6aeaffc1755f4b669864abd5ba9313f66cf8764
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 10:58:47 +00:00
Bill Yi
5c24e1864d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie52051d98db9590f6a0de10033febcd6a5126b75
 2023-03-15 03:34:19 -07: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
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
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
TreeHugger Robot
83289a7b29 Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3 am: ff5badcecd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475

Change-Id: Ic5fa8faab2b126955bdef717a7a771a1d58b3078
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:47:31 +00:00
Daniel Huang
e789fa94ca Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427 am: 91f72db16a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546

Change-Id: I85a0a41b4a261c2d626135f59f1c310c698ffb13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:47:23 +00:00
TreeHugger Robot
f96a7553a2 Merge "[Regional preference] Make prerference and fragment title are same." into udc-dev am: bec6e40dd3 am: 05da9199bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22087475

Change-Id: I9420e554b4dfd9af4d74107044f445a5f10c7ee0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:46:33 +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
Daniel Huang
8c87d9233d Merge "The PK settings UI should show subtype labels instead of the subtype's language names." into udc-dev am: f826b3f427 am: fd695cd189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21809546

Change-Id: Ida6029fe696b145b625949e6ac0287cc27d2d119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 09:45:49 +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
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
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
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
SongFerng Wang
65734dd29b Merge "Avoid ANR when UI query network selection state" 2023-03-15 07:52:59 +00:00
Jason Hsu
1ceac581de Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: 42fc665f48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I22d3b8499aec10b1d7c10f0d1fa9162698c82553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:39:37 +00:00
Jason Hsu
bfd9c0e2d0 Merge "Return getMetricsCategory() for each new page hearing aid and flash notifications in android U" into udc-dev am: 7ab852b48e am: b6a359d888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21978662

Change-Id: I680ded035b514a239c95eeeaab882b42509c82ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 07:38:47 +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
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
SongFerngWang
7b80b4ecd9 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
 2023-03-15 14:45:05 +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
6d462eaef0 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 5fb635e82d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Ic28ed78b9c8a26a4f7a599baf19992c255f2547b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:38:58 +00:00
Tom Hsu
2f4e3b3041 Merge "Add Regional preference UI for Physical keyboard location." into udc-dev am: 29bcb4d553 am: 510b9b6b49 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21913842

Change-Id: Iac2042b8bfe511b51551394b7e7cd5b0cb16da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 05:32:52 +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
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
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
Automerger Merge Worker
aaa3c072c4 Merge changes from topic "am-e11d37ae5f8f40d3a101634f86b7b204" 
* changes:
  [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: a0c2293966 -s ours
  [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: 9a78f43bb0 -s ours
 2023-03-15 02:15:59 +00: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
Xin Li
a248a10223 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: a0c2293966 -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: I7d3a5bf116166451ded6add8823b4909ded6e918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:05:47 +00:00
Xin Li
f64b08cee4 [automerger skipped] Merge "Merge Android 13 QPR2" am: 19ca5d6a6e -s ours am: dc399ade52 -s ours am: 7e131d0b94 -s ours am: b17a40e1ae -s ours am: b893175b4b -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: Icdd71d3ab2efd14c30fa0dc7b781f177e1f381a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:05:25 +00:00
Xin Li
7c485bdf53 [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: 9a78f43bb0 -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: Iafa821dd60c0a69841a853a1799e45210815cd78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:03:52 +00:00
Xin Li
3b742c4b3f [automerger skipped] Merge Android 13 QPR2 am: d15a2d7e0c -s ours am: d19379e607 -s ours am: 8d7a6eb577 -s ours am: 8ef1a9a1be -s ours am: fc853a6532 -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: I5811aced6c2611033116a77d3e68668496c4fbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 02:03:35 +00:00