summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-28Merge "Snap for 8366858 from 62302a8ee19b9586255dfe441e27791e07f97efb to ↵main-cg-testing-releaseAndroid Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2022-03-28Snap for 8366858 from 62302a8ee19b9586255dfe441e27791e07f97efb to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I85a17eb2fcb00b5c49d390e84b4e778860339392
2022-03-28Merge "Import translations. DO NOT MERGE ANYWHERE"Treehugger Robot
2022-03-27Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I7afda1c68c22efae3eedbda13f2b3beaebd4fd93
2022-03-14Merge "Snap for 8294919 from 994742e02a11190f4939db204754b853f6efcadf to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2022-03-14Snap for 8294919 from 994742e02a11190f4939db204754b853f6efcadf to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: If91a72bd45c4baae3d02e8f96903534c15bc0b5e
2022-03-08Merge "Merge Android 12L"Xin Li
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I6dbe30cd3a6a18c4186d45ebb161aec7dd941501 Change-Id: I51b18d17d82918f2cb9e02ede14a55153c564284
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: Ib6a80da4dd85b8d199b8c316feaf5bc330039666 Change-Id: I6dbe30cd3a6a18c4186d45ebb161aec7dd941501
2022-01-16Merge "Snap for 8084792 from 19955de794d2439e22f556d7b39c938bad3d3932 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2022-01-16Snap for 8084792 from 19955de794d2439e22f556d7b39c938bad3d3932 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I6fabf5cdab0d01c3396de3738e68fe7930d296cf
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
19955de794 -s ours am: 316749d6d3 -s ours am: 7e2e6722ae -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1943725 Change-Id: I8a48889fb6dd1cc4c997bb46b5c61dfb5313c933
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
19955de794 -s ours am: 316749d6d3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1943725 Change-Id: I7b3ed1486ed7f4e95cbba23279c487fe1eaaa176
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
584752cb6e -s ours am: dd461a5ab6 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/16598085 Change-Id: Icd38b7face6d93e96990825f9a50bbbfb089597b
2022-01-11[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
19955de794 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1943725 Change-Id: I5c3ead8c81f6a4d642a6238593201b786b6bd6b7
2022-01-11[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
584752cb6e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/16598085 Change-Id: I3829c7ce67847f92f29e669db96eac94c419df55
2022-01-11Merge "Import translations. DO NOT MERGE ANYWHERE"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ib6a80da4dd85b8d199b8c316feaf5bc330039666
2022-01-10Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I2732a2441362ff45f4d99da2a87655d33faf3780
2021-12-26Merge "Snap for 8029350 from 211efd2c343882201927b62cbfadecfa9fbd3432 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-12-26Snap for 8029350 from 211efd2c343882201927b62cbfadecfa9fbd3432 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I6bd6044f31b12aa1192fcf2f1f6e0be5abcae26b
2021-10-10Merge "Snap for 7810574 from 0b55aed83b049e2270dbde35dfa5e850c08cfaeb to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-10-10Snap for 7810574 from 0b55aed83b049e2270dbde35dfa5e850c08cfaeb to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: If741e3444729629f35483fdcd796f77effc3ef20
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: ↵Xin Li
feba27c9b1 -s ours am: 22e93151f9 -s ours am: 211efd2c34 -s ours am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1847856 Change-Id: Icb1c65ed14dd12979e8f6a63298c0fec2178821e
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: ↵Xin Li
feba27c9b1 -s ours am: 22e93151f9 -s ours am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1847856 Change-Id: Ie108b693feb4f833aa9f1c86f944d98ee4b2dabc
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: ↵Xin Li
feba27c9b1 -s ours am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1847856 Change-Id: If83bb491fc3098af152f7942a4f3e1a40bc193de
2021-10-08[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s oursXin Li
am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1847856 Change-Id: I8eec33ef04d2aeefa142bef0e64c64ede7657a26
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
Bug: 202323961 Merged-In: I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c Change-Id: I6e0530735b75fb5731014ddcb26faa92320809f3
2021-08-22Merge "Snap for 7664297 from e6bb5cbc7c9a34304836fc423c8e1c8ccd8c400c to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-08-22Snap for 7664297 from e6bb5cbc7c9a34304836fc423c8e1c8ccd8c400c to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Iab0ff4d57894de6d8d76279b3177465a25bd004f
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
440d9d5afc -s ours am: 20af630876 -s ours am: 0f90a54c1b -s ours am skip reason: Merged-In I279b8ef4746d78ca1cb57bda6399fee3cc695f2c with SHA-1 9717d5cf34 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/15550975 Change-Id: Ia910d6f819f474288cae06d850586b4ccad760ed
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
440d9d5afc -s ours am: 20af630876 -s ours am skip reason: Merged-In I279b8ef4746d78ca1cb57bda6399fee3cc695f2c with SHA-1 9717d5cf34 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/15550975 Change-Id: I719ab73f6499dfbfcb7142b8d37597b458a552e9
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
440d9d5afc -s ours am skip reason: Merged-In I279b8ef4746d78ca1cb57bda6399fee3cc695f2c with SHA-1 9717d5cf34 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/15550975 Change-Id: Iac56bfc82f8813dfa3cb2ed9b015dfb46f9bcca1
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: I279b8ef4746d78ca1cb57bda6399fee3cc695f2c Change-Id: I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c
2021-08-02Merge "Fix Colors crashing on rotation" am: e6bb5cbc7c am: 0388b59400 am: ↵Galia Peycheva
9717d5cf34 Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1781227 Change-Id: I2c21e516cc3bf97d28e65ab5ccd410e0d6f1db75
2021-08-02Merge "Fix Colors crashing on rotation" am: e6bb5cbc7c am: 0388b59400Galia Peycheva
Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1781227 Change-Id: I279b8ef4746d78ca1cb57bda6399fee3cc695f2c
2021-08-02Merge "Fix Colors crashing on rotation" am: e6bb5cbc7cGalia Peycheva
Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1781227 Change-Id: I327128d8e3a315fd88a6b565fcc8ed779abb0872
2021-08-02Merge "Fix Colors crashing on rotation"android-s-beta-5android-s-beta-5Galia Peycheva
2021-08-02Fix Colors crashing on rotationGalia Peycheva
This CL makes the Colors dream service create a new SurfaceView and render thread on every onAttachedToWindow. onAttachedToWindow is called every time on a screen rotation. Bug: 160375160 Test: verify Colors is rendered properly and doesn't crash on rotation Change-Id: I5e76ff5c723b840503bbee113a1c6b3dff0e25dc
2021-07-04[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
0a878cabbe -s ours am: 442c1e52f4 -s ours am: 3604ca6220 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1755763 Change-Id: If640eaa66a288de5c270f8cf84401905df238c18
2021-07-04[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
0a878cabbe -s ours am: 442c1e52f4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1755763 Change-Id: I791101f5afd682fec134667698da2184f472b2ba
2021-07-04[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ↵Treehugger Robot
0a878cabbe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/1755763 Change-Id: Id9ace5409dd2f62b8d1dc2de99beb38176242702
2021-07-04Merge "Import translations. DO NOT MERGE ANYWHERE"android-s-beta-4android-s-beta-3android-s-beta-4Treehugger Robot
2021-07-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ee3502ce57 -s ours am: e4cc2d5a1d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/15200339 Change-Id: I834a503638c944b67fadb966f87f7929ab16ceb6
2021-07-04[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
ee3502ce57 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/15200339 Change-Id: I0497c629b61742f37a74e94ae1a76444347c8c8c
2021-07-04Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I37372335a63ae8341386a6a81dd4784c3317ae29
2021-07-03Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I84e55a26ebc6c02e53298225894ecb54785ad201
2021-06-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7d9fd27df8 -s ours am: 210dc77177 -s ours am: 49138b3f2a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/14773029 Change-Id: I2c1e8a44e9296db9922f74cae8bd31c07214a632
2021-06-01[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
7d9fd27df8 -s ours am: 210dc77177 -s ours am: 44d5976482 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/14773029 Change-Id: Ibadf019421ac87c6c129be7105e96620591cca1a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 04:35:55 +0000