Treehugger Robot
d09899af46
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours am: 7853d5d24f -s ours am: 9f49f3ddb1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: Ie08e68d47ca82a82e527c7c661dff6f999437e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:48:04 +00:00
Bill Yi
6d60716c95
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours am: c94d32d87a -s ours am: 00757b5656 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: Ibb97f32b1bde0ce0bf0a115dcdfe80e26c255a92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:47:54 +00:00
Treehugger Robot
fc2736173f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I94918f57ddeab3a197826e1c337963e6cf19a6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:46:47 +00:00
Bill Yi
a8a67a3a13
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I78dcc5f02c10c4083772dde1e38feb9dc43c9c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:46:41 +00:00
Treehugger Robot
950b464c49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fa17c9b44e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I2ace8fd4e807e4b5f6480e51faaac9be849274cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:46:34 +00:00
Bill Yi
a07ebaca0d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: If29f8aebcc20c4bff481715a6dff41a23d41a604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:46:26 +00:00
Treehugger Robot
1e63c65f3f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: 510066324e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I4f68c395ab799d55208b6c4af20d9a0a1e030755
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:19:43 +00:00
Bill Yi
99e537152f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: bd2d9cddfc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: Ie664dcf66f041d3f45ee53a69ea1814639a74b57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:19:38 +00:00
Treehugger Robot
86bc070b7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fada6a22ca -s ours am: 1fcd56e84e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I2c2e71ba610778e6393c291ad2db6d914109b238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:18:55 +00:00
Bill Yi
a76da8f4d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 8ff46aae25 -s ours am: 9cf470ce3e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I2f5f08f17ff0fd3dad201f8e67b1fd215ada2328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:18:48 +00:00
Bill Yi
35c9662374
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 936e3a26c0 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212795
Change-Id: I5200b6f5f8febd8edfd4645d99e6a9bebb1946f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:16:25 +00:00
Bill Yi
930d0c61ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2f1b0008b3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212795
Change-Id: Ibda1e39ec39ee495207c06cd7818395f5f5d9c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:16:14 +00:00
Treehugger Robot
1fcd56e84e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours am: fada6a22ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: Idf697a6491efa3d6981406aba0abe1a0545855ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:04:33 +00:00
Bill Yi
9cf470ce3e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 8ff46aae25 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I0c638ceb5932f14b8045c1bdcd22abe38dce8d92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:04:27 +00:00
Treehugger Robot
fada6a22ca
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: Ib4961f3104fbbdbda5d1d80783b9c7b1af3a112e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:01:28 +00:00
Bill Yi
8ff46aae25
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I598e38c38c10de4240555b51e3107e1aa444b51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:01:22 +00:00
Treehugger Robot
fa17c9b44e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I11b9cdcb0f3e664522cb1651ff0ac9ce0bab5066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:00:19 +00:00
Bill Yi
81a368ddf3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I74d5030a7621446fb3d0a1c155e281cda9080894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:00:14 +00:00
Treehugger Robot
510066324e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: Ieef4b52d2ba9e649c14f13954d0352ad80f9d0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:59:38 +00:00
Bill Yi
bd2d9cddfc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I88e5bc5b2777d5c35e4424615d42a2865245bcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:59:33 +00:00
Treehugger Robot
98c4f16b1e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours am: 1c07e9b25d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I261df9c470f26500bc0b3144a259b4c2dce0152f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:57:59 +00:00
Bill Yi
fc347793bb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours am: 53d77dee18 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I48d5ffa3107910f2024077f60d64f1ed0373a77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:57:39 +00:00
Treehugger Robot
9f49f3ddb1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours am: 7853d5d24f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I11bfb02977c48764be1c6f97893d32d439621d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:56:33 +00:00
Bill Yi
00757b5656
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours am: c94d32d87a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I74a67287294daedde0e756203f1f81574ba1ae27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:56:21 +00:00
Bill Yi
936e3a26c0
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-07-27 19:22:36 +00:00
Treehugger Robot
1c07e9b25d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I494ef65fe809c5ffaca4feaa10f0c3f307bf9cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:14:52 +00:00
Bill Yi
53d77dee18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I29ac87d68a19968b1d9632367dd86e71d3b2c0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:14:36 +00:00
Treehugger Robot
7853d5d24f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 31f0efd2e7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: Id7774928f040ce5393b2995a5ce088bc0808aa74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:12:52 +00:00
Bill Yi
c94d32d87a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 557cad061e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210478
Change-Id: I24e6f01cf38fa58e52658da70fe3e3f00dd641bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:12:34 +00:00
Treehugger Robot
03e1e0f234
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: I51b4fe2aaa7c0c19335af09132879c2b1f6b42a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:05:23 +00:00
Bill Yi
04da45170f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212793
Change-Id: Iacfb8343818c2f54fcc58936d7df5abb5af29615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:05:13 +00:00
Treehugger Robot
76afc5c3bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-07-27 18:23:20 +00:00
Treehugger Robot
31f0efd2e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-27 18:20:15 +00:00
Tyler Freeman
96e31c83a5
fix(bold text test): reset settings when test finishes
...
Fix: 293250385
Test: atest packages/apps/Settings/tests/unit/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
Change-Id: Ie1917799f9619157ce5e32997bd3798c68da085b
2023-07-27 09:04:44 -07:00
Weng Su
903d3e6409
Fix WifiScanWorkerTest tests failed
...
- @Mock WifiManager class for WifiTrackerLib
Bug: 292993539
Test: Manual test
make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.wifi.slice.WifiScanWorkerTest
Change-Id: I01758cf5043f6dc9b08bd06f4a72d9232b2ad8ed
2023-07-27 21:25:29 +08:00
Avinash Vadlamudi
0fe62fa541
Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e am: fea57771ad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788
Change-Id: Icfb7379fab2fc973045c4cc381ae577468f1f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 11:42:35 +00:00
Avinash Vadlamudi
fea57771ad
Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev am: 4e460ed41e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24099788
Change-Id: If440d5c2a6e65a760af7836b180e443c420a5991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 11:00:07 +00:00
Avinash Vadlamudi
4e460ed41e
Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev
2023-07-27 10:20:48 +00:00
Weng Su
3505537aec
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: f7bd475bbd -s ours am: 37a29ac4a6 -s ours am: a3b8680926 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I8ba3d99e5674f9964f2d7a31992cd6d22da4746e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:11:35 +00:00
Weng Su
c31296cc59
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: dee47d1bd5 -s ours am: 01f4981e69 -s ours am: 32260411d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Id5a3e59760269f04ff4b1583a08704fcb24cb886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:11:24 +00:00
Weng Su
57a312e49a
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: 579351cc99 -s ours am: 05bda009bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I372bfb28d0ee16bf36475020f774efa6b3fca36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:11:15 +00:00
Weng Su
da40d5ab99
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 49856c7362 -s ours am: 6b51fdafbb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I74fb309668bd8d88af8f65d647f4aae40ea6f862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:11:04 +00:00
Weng Su
025044f4a8
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: c9ae9fe3d4 -s ours am: e11dab3f7a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Id820a8079a04d671e7cfbc41277d43111b247446
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:10:54 +00:00
Weng Su
004ab89411
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 7e645b1340 -s ours am: adf212e2d3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I417afd2e2b01a4f09d1e3436d8562392677b5d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:10:22 +00:00
Bill Lin
6acdfbd6bc
Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev am: 18d0e96e33 am: 918d7659bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210404
Change-Id: I78b3529660ddd786f425765dd6d9845e44adb10e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 09:09:39 +00:00
Weng Su
a3b8680926
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: f7bd475bbd -s ours am: 37a29ac4a6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I3311506c68e3ece2fdb308f0a793c6c5ac060b8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 08:25:50 +00:00
Weng Su
32260411d6
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: dee47d1bd5 -s ours am: 01f4981e69 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: If9cf7c8c9d56b73559e0c5d3b70308fa47826427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 08:25:39 +00:00
Weng Su
05bda009bf
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours am: cced777c0f -s ours am: 579351cc99 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Ib433a249736044287995f2f25b2a75aefb9111e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 08:25:29 +00:00
Weng Su
6b51fdafbb
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours am: 9ddb3ae3e0 -s ours am: 49856c7362 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I9fff0e2d367b53438c26a69aa07c53993b0dafba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 08:25:11 +00:00
ykhung
0610d2b682
Fix inconsistent connected without charging state in the Settings
...
Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).
https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119
Fix: 285204150
Test: make RunSettingsRoboTests -j40
Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
2023-07-27 08:21:49 +00:00
