Treehugger Robot
2150660ddc
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: Id149ac65a51676e1622a023ab3159ea2c0ecc731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:31:04 +00:00
Treehugger Robot
3263566899
Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177
Change-Id: I8fa4b811aa7799086468dc2a6abee1e4db444b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:27:13 +00:00
Treehugger Robot
14ebb061bc
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: If932fe3124f6ed49fc557a27e5ee4999cd41b941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:26:58 +00:00
Treehugger Robot
62193a6f56
Merge "work challenge: allow backgroud biometric auth" into udc-dev
2023-05-15 07:45:02 +00:00
Treehugger Robot
2b91f1a4cb
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev
2023-05-15 07:43:05 +00:00
Zoey Chen
0d1638c3d3
[Use] Replace settings LocalePreference with androidx LocalePreference
...
Bug: 263861083
Test: atest and manual test
Change-Id: I7af48074278df0b12c83500f0d2b61eb279e70be
2023-05-15 07:28:05 +00:00
ykhung
0cd24adec5
Add allowlist mechanism for battery optimization mode
...
Add a mechanism to add package name into the allowlist to avoid users
change the battery optimization modes for specific apps in the list
https://screenshot.googleplex.com/8hrHCcTh5bNYXqp
Bug: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I8efa6a55646d761f5bee3667a59b38ab68c74bc1
2023-05-15 14:28:49 +08:00
YK Hung
0de27e8c3e
Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175 am: a8830ef203
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222
Change-Id: I81572a268d63cda5084ff2e3a031b4757d330cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 03:59:40 +00:00
YK Hung
55a6b7cdc6
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: I94b81f612a8ce5852cffb34e1bbc70e6f5012610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 03:58:14 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
c0db5b8c33
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: I95939e1db59df1e87d9b41aabc6db758903c663f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:21:45 +00:00
Charles Chen
3381df525b
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: If0ba5e55167837372e10f933cfd5fb41ec73dc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:21:38 +00:00
Treehugger Robot
a823380436
Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829
Change-Id: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:30 +00:00
Charles Chen
0e46e04fb5
Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008
Change-Id: I18719743b87034ac5fdbdea213f5d70b7a9c1946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:15 +00:00