Commit Graph

49747 Commits

Author SHA1 Message Date
YK Hung
a8830ef203 Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222

Change-Id: Idc66a34c67b4ae570a6167c0704a25303a2629dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 03:42:48 +00:00
YK Hung
83de631175 Merge "Update battery health state intent (2/3)" into udc-dev 2023-05-15 03:27:44 +00:00
Allen Su
b77c13948d Implement LocaleNotification in Settings
Bug: 248514263
Test: atest LocaleListEditorTest
Change-Id: I8c5764997d1622f0885d5d32124a49759e585e42
2023-05-14 19:55:37 +00:00
Becca Hughes
78dc1a5631 Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: dd305f28e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I8fe8657feaa2a3c0ebb6ff165e21d696c7caa73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 22:33:34 +00:00
Becca Hughes
eaf7f58c5f Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: 93c340780f am: 557b140873
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: Ie39fa1d478e46fae1dd07156faae5fbd0951536d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 22:32:52 +00:00
Becca Hughes
a7dbd023ae Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: 93c340780f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: Icf6feffecedf230863f4762957888000859acf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 21:54:31 +00:00
Becca Hughes
557b140873 Merge "Add extra null checks" into udc-dev am: 598ff21b78 am: 93c340780f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I5afa2a97f895505572c024ce294d9785b4fb38f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 21:50:31 +00:00
Becca Hughes
93c340780f Merge "Add extra null checks" into udc-dev am: 598ff21b78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I5081a13eed1790c1093348faf06a7d311e4e0da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 21:13:35 +00:00
Becca Hughes
75466c4eb1 Merge "Add extra null checks" into udc-dev am: 598ff21b78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089

Change-Id: I9946b03d5a92b8a8328c4ffd3bb9d78eebbd81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 21:07:53 +00:00
Becca Hughes
598ff21b78 Merge "Add extra null checks" into udc-dev 2023-05-12 20:40:56 +00:00
Chris Antol
4f67221dd4 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 701babd574 am: 1cb9857c7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: I0a7be3bd16961daefa8077804175307ab79dec92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 20:03:31 +00:00
Chris Antol
8c4f831cda Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 701babd574
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: I51f78328b5c0527018c07588f90641d4556493c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 19:25:44 +00:00
Chris Antol
1cb9857c7a Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 701babd574
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Ied4ec5973e0a1c963be8b3b4e1e88e87f4874116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 19:21:28 +00:00
Chris Antol
ac6a3b0906 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50 am: 1015f14d61
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Idc2a37dd28eebe62a15583cea2d98a4624b7a798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 19:21:16 +00:00
Chris Antol
701babd574 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: Ib283b390ae0fa591fa8c97d550731464b3d9ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 18:42:20 +00:00
Chris Antol
8a7fdc628f Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464

Change-Id: I0a8ec6179e87ca56765103df17df03f9438b90c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 18:39:28 +00:00
Chris Antol
9567bd4a50 Merge "Remove SPA gating from App Cloning click ingress" into udc-dev 2023-05-12 17:56:05 +00:00
Peter Zhang
1efb727214 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: 521e527edd am: 8b7482cb5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: I392da92d26fe4aede85f8028f11bf025a7a40d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:51:27 +00:00
Peter Zhang
f7d5dec825 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 am: 4d0120712f am: fbcc7d6ad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: I4aefeee698974311536302ab848d575df5f55449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:44:52 +00:00
Roy Chou
3a5ffceddf Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: f482ff63b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I16c524b23639c8a1aec9c1b0f543a9c76f8d4288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:39:46 +00:00
Roy Chou
3b963fee25 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: 32a2e30074
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: Ifcb580e3e5379a4e33ce753425582e74ca535925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:38:43 +00:00
Roy Chou
bd95244bd7 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: 0bdc6ad2a3 am: e3e8c9b464
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I7fa830ae76d0489b2a3747c9a8cce13f96ccc5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:38:43 +00:00
Roy Chou
e3e8c9b464 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10 am: 0bdc6ad2a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I4b6f189fb36ca1158bea5a62616a580507bf46db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:24:14 +00:00
Roy Chou
f482ff63b9 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I23d2fec9ab12741fd35ca1ff130e8ec8a97f58e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:23:24 +00:00
Roy Chou
0bdc6ad2a3 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816

Change-Id: I5da848212d422435a6976798d203fc03ee3eb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 17:16:25 +00:00
Roy Chou
412c248c10 Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev 2023-05-12 16:59:26 +00:00
Peter Zhang
8b7482cb5e Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039 am: 521e527edd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: Ibaf7c82f601b1e4ccc41821cd669ff687a5d596c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:57:54 +00:00
Peter Zhang
fbcc7d6ad2 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7 am: 4d0120712f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Ie02be26b76bc48e90a779d9b50140a89d4039eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:55:47 +00:00
Peter Zhang
ed0af59d60 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: I7b99683979a3f0ba992d4a19534e265dc9facb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:55:46 +00:00
Peter Zhang
521e527edd Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951

Change-Id: Idc8edb4b38ee723e23f8b0460050c0b9fa41c447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:52:48 +00:00
Becca Hughes
400e5491a3 Add extra null checks
Test: ondevice
Bug: 281047738
Change-Id: I07ced78af5da086433aa4288949673161bfe4f20
2023-05-12 16:46:30 +00:00
Peter Zhang
79a76c9b5f Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: I53645ee6b0356cb623e2e55a69b0f42d960bd751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:39:45 +00:00
Peter Zhang
60069d3039 Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev 2023-05-12 16:22:38 +00:00
Peter Zhang
4d0120712f Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599

Change-Id: Id6b3de9b4ea52e3f039d963a8c048f1c5096cf14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:12:51 +00:00
Peter Zhang
04545138c7 Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev 2023-05-12 16:09:34 +00:00
Roy Chou
0aa67ede68 chore(#AlwaysOnMagnification): hardcode the feature flag default true
Set the feature flag getter default return value to be true to rollout to public. We keep the checking code so that it's still remote controllable.

Bug: 281788002
Test: manually test with adb command
Change-Id: Ie7f32721cf99d8a97c11f0f9c6d0d466c083d668
2023-05-12 15:57:56 +00:00
Rubin Xu
5b42447d29 work challenge: allow backgroud biometric auth
We observed a race condition that when work challenge is launched from
notification, the biometric prompt quickly dismisses itself because
it detects the launcher is now the foreground app. This change attempts
to workaround the issue by enabling the setAllowBackgroundAuthentication
optin in BiometricPrompt so it no longer dismisses itself even if the
foreground app is different.

Bug: 279766640
Test: manual
Change-Id: I453b7d603c6eb65f329afb38d8a190e21a7e4c01
2023-05-12 16:35:15 +01:00
Jason Hsu
67ac8e4b9f Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017 am: 9a4c3228a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ifaad45b39c55db4200515bcfcfff5ba7dbcf40ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:27:55 +00:00
Jason Hsu
9ba9527fb4 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1 am: 97d7422278
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I82da4c74c20b8f604613537b8744ab15ba45b0c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:27:27 +00:00
Jason Hsu
0522dc9b9d Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: 4714fe7a4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I4716ac5fc704aa4b6491e3df1a4f74128a97c339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:10:56 +00:00
Jason Hsu
4ecbb9c13c Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 3f6e93beea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: Ic1ce1c748c2ee749b4a73256a8d850df1232bb6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:06:05 +00:00
Jason Hsu
9a4c3228a3 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ic76821969c0e5fd06c294e4e4763867a648a77c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:00:28 +00:00
Jason Hsu
264071adcf Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60 am: c77fb81017
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: Ia30bcbd9e95ead6660ff3102a81ceaba1ece48a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:56:18 +00:00
Jason Hsu
c783497e05 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I5e0c136a30d4d4d948bcda0bc7885ba8c808aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:55:44 +00:00
Jason Hsu
97d7422278 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5 am: 782ad66ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I0513903c35e63f962a0cb4720f5f766062a1d101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:54:48 +00:00
Jason Hsu
c504d93894 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I122a929ee4ddfc9981dc492a4b209b78422c5bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:51:26 +00:00
SongFerng Wang
857464e9d5 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5c64b78f4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I1b5290b2618c7ab438b1ff69e45e42427817b13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:50:27 +00:00
Chaohui Wang
e7ef6d181b Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I97ae3a4cca6c312813baf30dc26819ef86db90fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:50:20 +00:00
SongFerng Wang
9eba2446df Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 5685b450b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: I183f074de1201e3c2eec2ddf9c88fd6b6696e063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:48:35 +00:00
Chaohui Wang
17735b5e3b Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 8badf64092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I59f2642a884692414426e0775788e07802814669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:48:23 +00:00