Commit Graph

124971 Commits

Author SHA1 Message Date
Becca Hughes
ebb465971b Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b am: bee80de992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: Iceb6a59344669bb640fd50ab51eb8c50dc27cab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:42:55 +00:00
Becca Hughes
bee80de992 Merge "Add combined provider class that manages new settings UI" into udc-dev am: 99f45dd59b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911585

Change-Id: I840453294516e478f898afc68b1c50481eb8f384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 21:04:19 +00:00
Becca Hughes
99f45dd59b Merge "Add combined provider class that manages new settings UI" into udc-dev 2023-05-02 20:16:32 +00:00
Ioana Alexandru
b7c9cfd602 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: e0551da7c5 am: e0ea63b4e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I22dd666fed752f4e6bd4c1a2eefa15caa2895fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 20:02:07 +00:00
Ioana Alexandru
eef8d8da58 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: ca769153a0 am: 4f42a56682 am: 22ca48e667
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Id42debbd53d4a065a2b65d8fe3cd8b6164ddc76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 20:01:10 +00:00
Ioana Alexandru
8c36d2080e Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: 11c63e7479 am: a0458d4301
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I884fafdb9ff7219386a6a8ee9712bdc6eeca7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 20:00:40 +00:00
Ioana Alexandru
e0ea63b4e1 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: e0551da7c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Ie4018c6917a02d42585997c3c670cc9d4a1e78a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:56:55 +00:00
Ioana Alexandru
22ca48e667 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: ca769153a0 am: 4f42a56682
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I076bc4d91e32e13c1d14791cc2fece3fcddfe61b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:53:23 +00:00
Ioana Alexandru
a0458d4301 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6 am: 11c63e7479
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I8ffe4113904c38aafc4fb2accd537a93bc21f00e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:51:28 +00:00
Ioana Alexandru
e0551da7c5 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I0e8043ab275a62be19c5ed8a210e5f426c295d53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:12:50 +00:00
Ioana Alexandru
4f42a56682 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: ca769153a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I14a4b5da948cf0eba3d609e5635b82f3e08fc3ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:11:50 +00:00
Ioana Alexandru
11c63e7479 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: c1c20274c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I95477a582ab7e7e1424dc67814aa0c4dba05bab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:10:04 +00:00
Ioana Alexandru
b0e8942b2d Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4 am: 38929d38d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I3e9e9958d1d5ab82cb82e3dbaa2a62be3ffdb7a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 18:08:41 +00:00
Becca Hughes
ea03b3e2a0 Add combined provider class that manages new settings UI
Example of how to use: https://paste.googleplex.com/6523798525313024

Test: make
Bug: 278919696
Change-Id: I934a5f6d02b50f8c97bda6d997902a42ff88e26f
2023-05-02 17:37:44 +00:00
Ioana Alexandru
c1c20274c6 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Ia4348c7ab9369a0bb40dd30c2db39e6824e1bc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:32:30 +00:00
Ioana Alexandru
38929d38d3 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: I6bd6317bcd6b65aae1fe1815aed7c1ffccd4400b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:30:12 +00:00
Ioana Alexandru
ca769153a0 Fix AmbientDisplayAlwaysOn isSliceable. am: e0a4a343c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897539

Change-Id: Idb7f1807b789a1050e31e137f81631fc7f39f8e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:28:49 +00:00
Treehugger Robot
d3959ab162 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8 am: 3d746f793e am: aba69c0643
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I1c39df55c2d7afb91fda34817378b2ca279bea3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:11:20 +00:00
Treehugger Robot
60f3904344 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 251da57429 am: 181580bf38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I069f3fb9bd35911d20632c1a354da0ba5bb790bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:08:53 +00:00
Lucas Silva
cf027a2f4b Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 439cdd904f am: f3c0f501ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ifb4800fed62f62417d9ad2341a59e773543ca389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 17:06:57 +00:00
Ioana Alexandru
e0a4a343c4 Fix AmbientDisplayAlwaysOn isSliceable.
I changed this method to return true in ag/22761786 thinking that it was
necessary (as per the example at
https://g3doc.corp.google.com/company/teams/apps-android-settings/howto/settings_slices.md#preference-controller),
but this breaks a test, so I'm rolling back that part of the change.

Fix: 279881487
Test: presubmit
Change-Id: I87716a0daf5face9a79f98353b49ea2166226279
2023-05-02 16:52:26 +00:00
Chaohui Wang
e5d315b759 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 34deed3eda am: 0f1ccb0cff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I5f0dbc11899903a69b6a276471f92d8a36352c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:48:28 +00:00
Treehugger Robot
ba0ffc41a7 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 9b53ff64ab am: 8bfd465696
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I891b2d2d86f1cb60932910d41c5dbac45e6855b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:47:04 +00:00
Treehugger Robot
d84d92939f Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: e769c5b4c9 am: b7b13ceb41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I7da3b8b6b0112d4f9d773b5f3f238c4aea85c088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:45:22 +00:00
Treehugger Robot
aba69c0643 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8 am: 3d746f793e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I29d7e009245653a6e1506d8c277c71017acff340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:45:09 +00:00
Lucas Silva
2200fbd6fb Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b am: c3284ad39a am: 038cae6393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I00a5d739dd27c7b65575ad521e0c987323597d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:29:31 +00:00
Chaohui Wang
ffd55b99da Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35 am: 55ee4d3d9b am: 21835b0e83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I742d6136122cc57b31ab32d0ce063dce31fe9060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:23:47 +00:00
Treehugger Robot
3d746f793e Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: dc5e91cec8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I2daba6bdb99534ca9a943e7c5fc98c2ca96f943d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:04:32 +00:00
Lucas Silva
cd056adb45 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 65c8f6bcc6 am: da2d82c1f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I5fe58a3cb0914f22bcb18164dd2b2c42d4856f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 16:04:05 +00:00
Treehugger Robot
f1528c9830 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 648266e8d7 am: 8aad80fe7c am: 85c1ead6eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I6931da484945fb8be8024399b4a3378cda438ac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:57:47 +00:00
Chaohui Wang
94c2834e91 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 719b2f1f60 am: 507be6a484
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I8ae9406ca1b8485a0d450d5abfe3a0b28b8f333c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:55:49 +00:00
Treehugger Robot
48d1ed2c73 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: aa354d5666 am: 92124f26b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I992a66382043209bcb5870d9d6677a0e02f5398d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:44:51 +00:00
Treehugger Robot
181580bf38 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 251da57429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Iaf57a8355fbfba35fdec560c26417c6c4fd56677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:30:12 +00:00
Lucas Silva
f3c0f501ce Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 439cdd904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Iaa0011e01dac28edd8f78dd855c50f0c1b3dc1cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:29:24 +00:00
Chaohui Wang
0f1ccb0cff Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 34deed3eda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: Ifa33066316870345c9181d84d99971f1da022033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:45 +00:00
Treehugger Robot
8bfd465696 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf am: 9b53ff64ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I9b044d09821de4e62332770701ef0dda622de2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:26 +00:00
Treehugger Robot
b7b13ceb41 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: e769c5b4c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I6adb04c194e7c064b69f9f575a2c508acca3ea93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:28:05 +00:00
Lucas Silva
038cae6393 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b am: c3284ad39a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ie7d234d0513199ec13869deb5a62ce919ec9d5d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:27:50 +00:00
Chaohui Wang
21835b0e83 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35 am: 55ee4d3d9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I7e90fef152c992efe5f901769c18bbd3612d350a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:26:32 +00:00
Treehugger Robot
251da57429 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I55486c2659d78ccb300f19f26b20425b315ed5ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:20:43 +00:00
Lucas Silva
da2d82c1f2 Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: bece3e4b9f am: 65c8f6bcc6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: I63fcd27fb57d16edbb9dad3cdca80c00dda329d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:18:50 +00:00
Treehugger Robot
1a2d75bb4c Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: a6c44f048b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I8d1ecffc1b8890233ab44a349d2e9ea684e10eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:16:31 +00:00
Treehugger Robot
9b53ff64ab Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732 am: d5921d0bcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: Id16884d7d94fa7f214e34bea5e98271dbdf34cfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:16:19 +00:00
Treehugger Robot
dc5e91cec8 Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: If4ea67c5c9ac76a576fa94fd6b9673082039ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:15:41 +00:00
Treehugger Robot
85c1ead6eb Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 648266e8d7 am: 8aad80fe7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: I2ad446b943e9c374b0fb7e7539aad26f421f9945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:02:42 +00:00
Chaohui Wang
507be6a484 Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: ef748cfc36 am: 719b2f1f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: If9b754e56b5f09c323f4dda804d47f300ed1fc66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:00:47 +00:00
Lucas Silva
c3284ad39a Merge "Fix colors for dreams settings according to new spec" into udc-dev am: 9bd47de298 am: 0ff016cb7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954741

Change-Id: Ie413cb1e36ad0c870633b02c8571086761ac8655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 15:00:16 +00:00
Chaohui Wang
55ee4d3d9b Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898015

Change-Id: I25e90c935c9a363127f9bbdf79b90670fbe47fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:29 +00:00
Treehugger Robot
d5921d0bcf Merge "Add tests for config check in ClonedAppsPreferenceController" into udc-dev am: d624141732
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954943

Change-Id: I18fe27407d8f6003b597a4a9e98ed3b30cefe626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:58:21 +00:00
Treehugger Robot
92124f26b6 Merge "Fix battery percentage is inconsistent in settings" into udc-dev am: 3b60e2a9c3 am: 01d7ed6a61 am: aa354d5666
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22948142

Change-Id: Icac7ab915fd8da8cead98dbfe10cd7ef904f7e75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-02 14:57:43 +00:00