TreeHugger Robot
|
7d14d18af0
|
[automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 3d886d929e -s ours
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 9272c0e3c8 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I5b5fcd65f51a2195b1ae91c1f746473615a1143f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:33:11 +00:00 |
|
Tom Hsu
|
32dd2dc83c
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I5fed4eb62ef9d72b24e0909126c3592eab949959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:32:46 +00:00 |
|
Tom Hsu
|
27a0488790
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 9d3ac48f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: If2e552263d63342ec69eb3b93ccf357c60bcf59b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:32:17 +00:00 |
|
TreeHugger Robot
|
758c01fbb8
|
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I91aaaf25b6b8e8d865b4104eac643bb97bf52a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:13:36 +00:00 |
|
Tom Hsu
|
07db6514d3
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I75594ae645fa1556b08f639f4f3c014d7038103b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:13:06 +00:00 |
|
TreeHugger Robot
|
728b1b8337
|
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I9e96a83571c105b8858dc4bdc4f578dc6720f652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:12:49 +00:00 |
|
TreeHugger Robot
|
3d886d929e
|
Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605
Change-Id: I0e960f28ea3818f8d9dc1200bb4087ddf668846b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:12:41 +00:00 |
|
Tom Hsu
|
4d3264553c
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: Ibff6a407d7211597f6f8cf97c4ddf7403f11330c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:12:12 +00:00 |
|
Tom Hsu
|
9d3ac48f44
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916
Change-Id: I640022d4161fd17a8a01770a6a031b6551d8de76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 05:12:09 +00:00 |
|
TreeHugger Robot
|
1742524dd3
|
Merge "Show disable dialog box when none is selected" into udc-dev
|
2023-05-11 05:02:34 +00:00 |
|
Bill Yi
|
033e4f621c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: df7171b29c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: If1a10035719b7c7cc240a34172f2be3f4590c771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:54:25 +00:00 |
|
Bill Yi
|
43bfeadf44
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours am: fe4f51b4ab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Ib38519b0678f00bffeb4ebb39dc9cd8da76e1ade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:50:03 +00:00 |
|
Bill Yi
|
d0e755b576
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: c5708ff051 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I84f301fb63dea19c6b9ed0e1d1de8bc471e0c19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:49:19 +00:00 |
|
SongFerngWang
|
f4c5c8ef5e
|
Update the wording for LE Audio
Add the summary for LE Audio toggle
Bug: 280000165
Test: build pass
Change-Id: Ic1eee71d6ff70d01e9a37ab0ec06cfaf639fe963
|
2023-05-11 12:30:59 +08:00 |
|
Tom Hsu
|
5576947555
|
Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev
|
2023-05-11 04:30:19 +00:00 |
|
TreeHugger Robot
|
6217cc2c18
|
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b am: d025a6f35d am: c7c5ed67cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id8c4a73bd6ef37bcfee05a87274e49953bcd8e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:24:11 +00:00 |
|
Bill Yi
|
fa0b2789df
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -s ours am: 2292bd9446 -s ours am: e6fac1e361 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id488990c1cdfc2238528c3cacf7b3cdb35fd8f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:24:04 +00:00 |
|
Bill Yi
|
fe4f51b4ab
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Icda1661a7d64321824675959a8e84ec9d675442f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:12:34 +00:00 |
|
Bill Yi
|
df7171b29c
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Ice35642bab935922131380e3942f60112f9bae6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:10:43 +00:00 |
|
Bill Yi
|
c5708ff051
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I0e3d26fc1779000ee21dbb21f5c3d5d507224a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:08:21 +00:00 |
|
Bill Yi
|
bc489c43fc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: fb47fec995 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id430738bcb36e1bb52ad73827a9ddd2a6f73a25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 04:07:24 +00:00 |
|
Automerger Merge Worker
|
03aaab54bf
|
Merge changes from topic "am-6ee275e4b13e47869f6617c1da261643" into udc-qpr-dev-plus-aosp am: 49f3ae7345
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I8c19d4defb5455b005aacc55d85d7a866ea368e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:56:25 +00:00 |
|
Treehugger Robot
|
addb72e027
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: 11f279fcfb -s ours am: 00769fdce2 -s ours am: 980c2a5f24 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I9c4b5090aa2066669c75e2250cc09d6b7f2b40a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:56:07 +00:00 |
|
Treehugger Robot
|
78ada9d395
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: 560129e42f -s ours am: c5fbb4e3ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ibc06bff0a15782df5298fbdee005b1c3df67a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:53:30 +00:00 |
|
Bill Yi
|
ba4305b9ef
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: c1d77f492b -s ours am: c305ac507c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: Ic5d4de4e4f1eb223c5f5305f282013e47cab3fe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:53:28 +00:00 |
|
Treehugger Robot
|
5828aa726c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 275f119ae1 -s ours am: 6dd581d8c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Ic6d37a2a7ae58dda73277bd782dfb9ee66cf6a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:53:26 +00:00 |
|
Bill Yi
|
4c1aafc850
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: ba6a55423d -s ours am: 6f45f4f389 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I6a6dac1ba42dff9421c5b72c894631e7121f748a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:53:05 +00:00 |
|
Treehugger Robot
|
65bf19227f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: 8e1636b67d -s ours am: 6cdf599ce2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: Ieb817e9b9f1e5cbde9643f891cf624ed084ccbe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:52:46 +00:00 |
|
Bill Yi
|
58702d653b
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: a8e65872e0 -s ours am: 1f75b586b6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I67946e21ccb7f6ed115950c115734f8d04008805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:52:28 +00:00 |
|
Angela Wang
|
750a6907ca
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: f4b7715453
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I9ab0ccf97d8f7fd56edf208fcfb6488cb65bbbbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:52:27 +00:00 |
|
Treehugger Robot
|
47f58c5491
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 767a923ecd -s ours am: d8e8583c71 -s ours am: bae0e18f93 -s ours am: c4bd0a79ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I96f7037858ad7a6e4cf1dfe7a4524c208a7e4bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:49:22 +00:00 |
|
Bill Yi
|
c7a89c4c1f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6b8c61c9a6 -s ours am: 33dd95eda1 -s ours am: 951739e625 -s ours am: 3f76100838 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121672
Change-Id: I5dcf41e5d85aaa417e69d1728fd23966b925925d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:49:15 +00:00 |
|
Treehugger Robot
|
29fdb805fb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d28f600d0e -s ours am: 6ace5ad965 -s ours am: 7fd8c31e9b -s ours am: 64a9cbe3b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: I472cc4e4ec7539aa144bb5a890bd7724bffd31dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:49:13 +00:00 |
|
Bill Yi
|
f094f93215
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e69bec0564 -s ours am: 6cc5e5c226 -s ours am: 39b779caa7 -s ours am: 049ca9b48b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121133
Change-Id: Idefd01be6e587650e1291a14e734945af8ee7f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:48:57 +00:00 |
|
Treehugger Robot
|
ccba5de3d9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3b7b23acb8 -s ours am: 76d0d8c12b -s ours am: fee4798267 -s ours am: 88259ac7d1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I07ac591430f27ed777c985479905b4490b11a645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:48:36 +00:00 |
|
Bill Yi
|
1f2c3c9bc7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be6f57545f -s ours am: e578c1477f -s ours am: e0ac237a6d -s ours am: 67fcc6aea9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121129
Change-Id: I44f7586522087257fa54628a5e426502f5187348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:48:14 +00:00 |
|
Wesley Wang
|
cf1190c7cb
|
Update battery health state intent (2/3)
- Update the extra from overheated to longlife
Bug: 278192441
Test: make SettingsRoboTests
Change-Id: I5a906e64effbd9aaf84446c0670249afefdf7da8
|
2023-05-11 11:27:16 +08:00 |
|
Bill Yi
|
fb47fec995
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I0772a2ac2db018242d86d6bfc9f4bd2841198d5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:26:45 +00:00 |
|
Bill Yi
|
541d74eb4d
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Id45461b6303f6d7f3da8e2b6c2c7c0e34447c74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:26:10 +00:00 |
|
Angela Wang
|
cc52fa2c4a
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: 378e9f073d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I94e759701eceda596fc86b6208642c68146a8e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:23:26 +00:00 |
|
Angela Wang
|
f9561db866
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c am: c4ff1e822f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I2522610e2c24d01fbec5909d14852abe94873c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:22:51 +00:00 |
|
Bill Yi
|
2b214a4e1a
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I9aff000835f3d1642e505e8543adbe7d059f359f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:22:08 +00:00 |
|
Angela Wang
|
f4b7715453
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I343a2e4d7ee4c765b4ee75e6f5a08e65a341a3a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:04:24 +00:00 |
|
TreeHugger Robot
|
c7c5ed67cb
|
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b am: d025a6f35d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I19614cbdb66f46d18a9c130b446cb92a2dbbcdfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:01:09 +00:00 |
|
Bill Yi
|
e6fac1e361
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a494fc7c5 2p: 40fae6e492 am: 77e2066906 -s ours am: 2292bd9446 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: Iff360850e825c6aa74e6f6d4ce9532d0ecebdb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:01:07 +00:00 |
|
Angela Wang
|
378e9f073d
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I8b271bdd8529fc596e5bf30132d0a1886e189fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:00:56 +00:00 |
|
Angela Wang
|
cd1a68db34
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: ae04daac19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: Ic2362f572bd3be5a857788e62d9e6afb97e06b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 03:00:38 +00:00 |
|
ykhung
|
8f56114489
|
Record app optimization mode backup into BatteryHistoricalLog
App optimization mode format:
https://screenshot.googleplex.com/di9DDzBfYf7ihfV
App optimization mode backup format:
https://screenshot.googleplex.com/GkVW5HrgGvmv5yh
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I60a9a76a8ffc89d625ee3f77c138a19181c81c38
|
2023-05-11 10:48:47 +08:00 |
|
Angela Wang
|
c4ff1e822f
|
Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916
Change-Id: I6088b5e1c4e5bb7db783ecca348e490c87b0a1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 02:44:28 +00:00 |
|
TreeHugger Robot
|
d025a6f35d
|
Merge changes from topic "tc_change_2305100725_43" into udc-dev-plus-aosp am: d803091a4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121132
Change-Id: I9af5fc172e4427f80ab9b51d7e6b3aeee1615822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-05-11 02:42:42 +00:00 |
|