Commit Graph

129704 Commits

Author SHA1 Message Date
Treehugger Robot
fd956769c1 Merge "Update WhenToDreamPicker to unique page id" into udc-qpr-dev 2023-07-28 00:03:28 +00:00
Treehugger Robot
b6e8ff6cb7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: Ia222e1f8bb1887452d0f46f4c6264c32390fd4d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:22:52 +00:00
Bill Yi
807e96ee52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I85d73d99151065a46a1020cdb0a2c7082d3d5df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:22:47 +00:00
Treehugger Robot
0563fa9109 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 67c8ca53aa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: Ib76974c16dfc3ed66695c10b8f40b282bf175c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:22:37 +00:00
Bill Yi
ca3a2026cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: c742ec92e2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I4a8d5d35751378d10590c93b4631b0c9ab267c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:22:29 +00:00
Treehugger Robot
49df734359 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours am: 3f7e055c28 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I6c236fdcc87fd5d8337a6eec7e2293f22fbe33b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:22:01 +00:00
Bill Yi
aea12d4991 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours am: 159d0436eb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I53c38375506ede99503599bac44953a1b705bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 23:21:53 +00:00
Treehugger Robot
67c8ca53aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I58cbd237fadb933c2d6d365c9dc986f5a73622a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:38:20 +00:00
Bill Yi
c742ec92e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I5dc9503de4bb4096e1fd2c3ac32a1d6b1c16e5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:38:14 +00:00
Treehugger Robot
3f7e055c28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I6cc0b52a43f7b6f4d914abaeba0bc4f7f27ebf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:34:16 +00:00
Bill Yi
159d0436eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I053e81d5f31f665c41249f2ff79b5e9d442364ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 22:34:04 +00:00
Treehugger Robot
84c2322af1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I2c986fa5e7ab0fdbacd0a0336b9245641e7648e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:49:38 +00:00
Bill Yi
fe5316f848 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24212794

Change-Id: I2b8424204dae662cd985ca5efdef8224b774675e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:49:26 +00:00
Treehugger Robot
fa7ecf3f01 [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: fc2736173f -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: I7da24a6c31e0cae4b5abf3142a0089ed75cdfb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:27:34 +00:00
Bill Yi
f8df9954d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a8a67a3a13 -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: I0a24ee3bff0a6a1182952170b38455268d46f777
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:27:26 +00:00
Treehugger Robot
a0b576c8a1 [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: 950b464c49 -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: Idea3284395813a0e109aa0cc95349fbf82dcf37b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:19:13 +00:00
Bill Yi
d9d8253ebd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours am: 81a368ddf3 -s ours am: a07ebaca0d -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: I595c9ee8203f5525103192bf554a3eca83ec3314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 21:19:05 +00:00
Treehugger Robot
bdb73ef28e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 21:07:50 +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
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
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
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
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
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
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
Weng Su
e11dab3f7a [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 skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008

Change-Id: I2535889207bccdc649fe630c7597b670e03fd0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27 08:01:58 +00:00