Commit Graph

124282 Commits

Author SHA1 Message Date
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
Chaohui Wang
1092789aa1 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: 45c2a27149 am: e7ef6d181b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

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

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

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

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

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

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

Change-Id: Icdba14edebbf914279bbf21fa7e5b791cc268e9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:06:10 +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
f7b152e9f3 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: I6bb6d3d1368a7e324a48a63e93a51c7e0cf88033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:48:27 +00:00
Chaohui Wang
8296309b46 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: I73a602f1b5ba43e45644bba997eeed15722192ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:48:17 +00:00
Jason Hsu
4ea92477bb Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

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

Change-Id: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:23:10 +00:00
Jason Hsu
0c57f69f60 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev 2023-05-12 14:20:54 +00:00
Jason Hsu
181cfa3aa5 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev 2023-05-12 14:20:23 +00:00
SongFerng Wang
4c73dde073 Merge "The UI does not remove the preference" into udc-dev am: 2821342259 am: 599fc1a314 am: 1815aa2460
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: Icb39fea672d00d37f1cd4c6321040b59bd68020a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:06:41 +00:00
Chaohui Wang
72c8c81d71 Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e am: a896e1f3e9 am: 47b4c83215
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826

Change-Id: I170bf0a1f8c630ecd0fd6c75b9807a198548f878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:06:23 +00:00
Treehugger Robot
e1ba18cbd0 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: 2318405bcb am: 8ee78e05e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I871f2605f7e3760b8667811fa36d86863e2d5cc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:06:12 +00:00
Charles Chen
0f60d938f1 Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: ebecdcf563 am: c4dd657697
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: Idccf5c1b106b808069c36d5bb7a6c9f33bf08886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:06:05 +00:00
TreeHugger Robot
680df57621 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: 499dc2c2b3 am: fbe71b965d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

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

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

Change-Id: I6fa98107dbf4b72c62647c43d32bb502b7c7e91b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:05:38 +00:00
Treehugger Robot
8311c506ce Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436 am: c0db5b8c33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: Id48f3897cb53ba7314a149ca368d57ca4026781e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:03:55 +00:00
Charles Chen
4d5bfea1ca Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5 am: 3381df525b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: I59a331190221a15657a0fab6f1d1b24f09bd788d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:03:38 +00:00
TreeHugger Robot
eb88153b97 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992 am: 76acd0b166
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

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

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

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

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

Change-Id: I9fab4b8455e745f2feda97c2485eb247bd1adb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:57 +00:00
SongFerng Wang
2821342259 Merge "The UI does not remove the preference" into udc-dev 2023-05-12 13:39:40 +00:00
Chaohui Wang
74e1412f8e Merge "Fix Bluetooth tethering toggle status" into udc-dev 2023-05-12 13:32:04 +00:00
Treehugger Robot
ec04fff5e7 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436 am: 13d2882385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: Id37226ead7ad60d4caf2eccee5ee7fb71feb4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:44 +00:00
Charles Chen
13055f01bd Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5 am: 0341754c8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: I537944f9dec3568df35f00c0dcdbb05d1d44324b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:37 +00:00
Treehugger Robot
8ee78e05e7 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: 2318405bcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: Id5f498679ae0ad4005a7ffe75642b717c37a7b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:28 +00:00
TreeHugger Robot
0dcc826898 Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992 am: 3181169bdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: Ia9ecb4e5ee3e4f76704bd93f75197e7794261a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:22 +00:00
Charles Chen
c4dd657697 Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: ebecdcf563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: Ib253252b1b640c673b97c9dd23d92c052a33472d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:19 +00:00
TreeHugger Robot
fbe71b965d Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: 499dc2c2b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I70fb30f119e7411c1a81077f35f71471ac46810c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:26:11 +00:00
Treehugger Robot
13d2882385 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I3226b3667702f3f012d7fded5989ec0591e16aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:48 +00:00
Charles Chen
0341754c8d Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: Ie1e68f359c6fc129759c367db4f393aa30897114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:42 +00:00
TreeHugger Robot
3181169bdb Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7 am: e64a1b4992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337

Change-Id: I1f8b3127c7c15c108ffe183d71d740e0473be636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:25:30 +00:00
Peter Zhang
9c0de639a4 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02 am: 08e762c056
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

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