ykhung
55ef64a3c8
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: I2520f65c4290bbb113bca305e7f84eb0844e3da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 13:21:25 +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
8b0483b0c5
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: Ief693b107c0102bbacf1d6f89127e1aa116ec11f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 09:09:56 +00:00
Treehugger Robot
ff067bcce0
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: I3cc19cbd68234046e2288d64e2f09ce12e700976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 09:09:16 +00:00
Treehugger Robot
1e83ce4e35
Merge "work challenge: allow backgroud biometric auth" into udc-dev am: 62193a6f56
am: 3263566899
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23211177
Change-Id: I843e88f614fa1f78fe1dd27d48efda7cc83c54b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:53:54 +00:00
Treehugger Robot
9cb3635c45
Merge "Add allowlist mechanism for battery optimization mode" into udc-dev am: 2b91f1a4cb
am: 14ebb061bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23216878
Change-Id: I87f6c1ccb62fb8a36260c812ab59e71a39532c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 08:51:54 +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
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
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
b14e8b6e0b
Merge "Update battery health state intent (2/3)" into udc-dev am: 83de631175
am: 55a6b7cdc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22741222
Change-Id: I438d03a849b14f291adc9d9d1c3e18a251203b12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-15 04:03:33 +00: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
Automerger Merge Worker
1fec325e25
Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into udc-dev-plus-aosp am: 1251421e24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I2708231cacde46660695e194ccf38b145cc3b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:08:34 +00:00
Bill Yi
0fad648f74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: b71dd78a86
-s ours am: b180bb350b
-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: Ib3898377680e7d28893cb97394f017f616442547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:08:10 +00:00
Bill Yi
c50088a5b5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: bc60e81eca
-s ours am: 60ec0ad7d6
-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: I5ab344e3a78d184f997f7e63f0f2b43051c7ba01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:04:41 +00:00
Bill Yi
b7c7115afd
Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884
am: 5c6f4e143f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I10d7aaf2f3ed89062ed3fcedf06eca43babcfa71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-13 00:04:32 +00:00
Bill Yi
719673d6c2
Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp am: 325045641d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I665e1edb81e020c7a2260e5de4eb198ea9c51b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:59:33 +00:00
Bill Yi
0fb22d1d70
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
2p: 7e3f3fd34d
am: 4782cd97ab
-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: I859a9b80d7b64a66e3170f80d34928db27db8ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:59:02 +00:00
Bill Yi
033c9f300b
[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: I94bd2f1f6f0f60a10d1c0f3e12367d59329c6885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:18:18 +00:00
Bill Yi
f316e8121d
[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: I48d1b67db29fe53c142d55f3751008743a02d3d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 23:18:06 +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
Automerger Merge Worker
1251421e24
Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into udc-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: b71dd78a86
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb
-s ours am: 1f9dab1c8c
-s ours
2023-05-12 22:59:29 +00:00
Bill Yi
60ec0ad7d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: efe3ce5660
-s ours am: bc60e81eca
-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: I302ec8ee16816a63745bcf6c09d9ac965a2c370a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:59:24 +00:00
Bill Yi
b180bb350b
[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: I6fe52f17c0829e4c9951ee3a950b64c6f853f551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:59:10 +00:00
Bill Yi
dd9f701f14
[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: I8ef0737fba8d04be287f6587a47757bdcacd26ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:58:46 +00:00
Bill Yi
5c6f4e143f
Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp am: a27aa2d884
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I9ea15478cc4c3a9e2d2ec15e28b88f8ca045678d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:58:43 +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
bc60e81eca
[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: I7b28ec85ac06812a818962c01acf6a18dd395239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:55:09 +00:00
Bill Yi
325045641d
Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
2p: 7e3f3fd34d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
2023-05-12 22:29:01 +00:00
Bill Yi
a27aa2d884
Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
2023-05-12 22:29:01 +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
794fe3e41c
Merge "Add extra null checks" into udc-dev am: 598ff21b78
am: 75466c4eb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089
Change-Id: Iee58140eabae769075432804947c65ce10ee0f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 21:55:09 +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
ceda4cc281
Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50
am: 8a7fdc628f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464
Change-Id: I293845133628c1773ef0724576fd167b5b10cf66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 19:26:50 +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