TreeHugger Robot
4017503fb8
Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
am: e4510d3bf5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I2fc962a2f75a2feae42c45cf6f7629659cd498ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 01:23:11 +00:00
Rahul Sabnis
7840717139
LEA developer option is enabled if the BT LEA flag is enabled
...
Bug: 281568856
Test: Manual
Change-Id: If59afff53c304e38074d7a9999329dc039d4cffb
2023-05-15 17:53:26 -07:00
TreeHugger Robot
c59fbb1d28
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev am: 92e760861d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155080
Change-Id: Ie1f2632f9e3a6825b856555e3aadd8cd81bbcd90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:40:48 +00:00
TreeHugger Robot
e4510d3bf5
Merge "Enable presubmit biometrics unit tests" into udc-dev am: 116f5c7d12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23151357
Change-Id: I37bff8aa023f1d26a4b2a785680fedab36125fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-16 00:40:46 +00:00
TreeHugger Robot
92e760861d
Merge "Fix FaceUpdater.enroll unit test fail in aosp" into udc-dev
2023-05-15 23:56:06 +00:00
TreeHugger Robot
116f5c7d12
Merge "Enable presubmit biometrics unit tests" into udc-dev
2023-05-15 23:56:06 +00:00
Ankita Vyas
84f8456a80
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
am: 837adaafd8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: I65734ccca5650342a9eb9b5a33f8980a9c79676b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 23:10:34 +00:00
ykhung
78ea309de9
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
am: 7a343c34d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I08b645a313768575c2758bfa8840fd984fe49d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 23:10:04 +00:00
ykhung
4085e14605
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
am: d056edc15c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I0e9e1587a97fc165baa29e090972ecbfa69bce1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 23:08:14 +00:00
Treehugger Robot
d2a6aef0da
Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56
am: 43cbfa4229
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177
Change-Id: I131f889f673273d964b8ff1cba3b5292ce700bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 22:54:43 +00:00
Treehugger Robot
b516dd216e
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
am: 2150660ddc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: I4c1be43732e1aa528008b0f59b852dc517045573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 22:37:12 +00:00
YK Hung
ff3bd2cae9
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: I51dbf32e86f13351c8de0db2e659b9c4f136ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 22:36:53 +00:00
Ankita Vyas
837adaafd8
Merge "Fetch summary only if feature is available" into udc-dev am: 44a613438b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240819
Change-Id: I568f0902f321d9bfc4ea6d421cef51ae63834dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:59:00 +00:00
Ankita Vyas
44a613438b
Merge "Fetch summary only if feature is available" into udc-dev
2023-05-15 17:37:11 +00:00
ykhung
7a343c34d9
Remove useless optimization mode backup for FULL_POWER_LIST am: 2c125d29a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23240822
Change-Id: I5e0eefdb421970cc0c405666db0e8b629e2423e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 17:36:41 +00:00
ykhung
2c125d29a3
Remove useless optimization mode backup for FULL_POWER_LIST
...
Remove the useless backup for the FULL_POWER_LIST, since we will not use
it to restore data, only backup the optimization_mode_list is enough
Test: presubmit
Bug: 192523697
Change-Id: I95f1f41732b8aff090e8b722896d153f6181a6ac
2023-05-15 23:45:16 +08:00
Ankita Vyas
98e4d7bf16
Fetch summary only if feature is available
...
onResume(loads summary) of controller seems to be invoked even when availabilty status
is unspported.
Bug: 278294334
Test: manual
Change-Id: I2486a7d61bea1b981ae56f0ff32b9d411be2ad14
2023-05-15 13:31:38 +00:00
ykhung
d056edc15c
Disable the optimization mode preference if the app is not settable am: 5cd3a7298e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23235859
Change-Id: I9d81ec00c5f5df7771f28f6bdc4775b7fdba987e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 12:43:08 +00:00
ykhung
5cd3a7298e
Disable the optimization mode preference if the app is not settable
...
https://screenshot.googleplex.com/BbQyEv6YCjPVwUF (allowlist)
https://screenshot.googleplex.com/3hTb8TQwGMQqcwS
https://screenshot.googleplex.com/6hdTAT2yNFucD9N (system app)
https://screenshot.googleplex.com/77T5JyAD5nZJpDT (normal app)
Fix: 281566984
Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: If7aa4b61bc806daa570187da24b7f454cd069dec
2023-05-15 09:32:09 +00:00
Treehugger Robot
43cbfa4229
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: I2e2d3804816b994073f29ea90d3e5b64f7044eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:31:22 +00:00
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
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
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
Milton Wu
abfb8a5e9d
Fix FaceUpdater.enroll unit test fail in aosp
...
Ignore related tests
Bug: 281627891
Test: atest FaceUpdaterTest
Change-Id: I028a7dd7fd2e56889ac27051678ca954c896da20
2023-05-14 02:57:05 +00:00
Bill Yi
2e5bc64514
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: b71dd78a86
-s ours am: cd8e1c9e26
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I584d6617f644ff3ae2dd9a03df0ba0a06bc6baf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:06:44 +00:00
Bill Yi
d074280871
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb
-s ours am: 1f9dab1c8c
-s ours am: 129296ea28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I17fc070e58e2fde9c569cee6cd1a36577e634ce0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:06:32 +00:00
Bill Yi
cd8e1c9e26
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: b71dd78a86
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: Ia1b46599d1c51218c3a69feaea77fe2f44675f6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:01:18 +00:00
Bill Yi
129296ea28
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb
-s ours am: 1f9dab1c8c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I08a29821315d8db74e21e17e6b6abda42d173d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:01:07 +00:00
Bill Yi
b71dd78a86
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: Icf8cbaa14ca3034efad8ddc0138e394114c6245d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:57:32 +00:00
Bill Yi
1f9dab1c8c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I6985ef37fb219639b4b32a8767908285219a6f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:57:10 +00:00
Bill Yi
efe3ce5660
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-12 22:29:00 +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
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
598ff21b78
Merge "Add extra null checks" into udc-dev
2023-05-12 20:40:56 +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
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
9567bd4a50
Merge "Remove SPA gating from App Cloning click ingress" into udc-dev
2023-05-12 17:56:05 +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
Avinash Vadlamudi
49e574dd25
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2
am: 071db861a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172
Change-Id: I684472f3563dc61c70f7b90cec0bb26acf30a317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:39:39 +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
Avinash Vadlamudi
071db861a2
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172
Change-Id: I293ee9f3f23ac0a49cce228e3febf3475f86282e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:22:44 +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
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
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
Avinash Vadlamudi
28cf617ca2
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev
2023-05-12 16:34:26 +00:00