summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-12[automerger skipped] Merge "Import translations. DO NOT MERGE"temp_b_131756210_stage-aosp-masterBill Yi
am: 8069da859c -s ours am skip reason: subject contains skip directive Change-Id: Ibb271460e1e291a8d57eae9bcba04874c5fc1b3c
2019-04-12[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: a9174a7fd7 -s ours am skip reason: subject contains skip directive Change-Id: Id5873d9f6e31d126b3b7aa6859f221f16cf7a1f6
2019-04-12Merge "Import translations. DO NOT MERGE"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-releaseTreehugger Robot
2019-04-12Import translations. DO NOT MERGEBill Yi
Change-Id: I55359ceb0e611ce8782d7a4162846d1b157d6d46 Auto-generated-cl: translation import
2019-04-12Import translations. DO NOT MERGEBill Yi
Change-Id: Iccc3338e2f0fdf47723372b44d1d47adb4b79181 Auto-generated-cl: translation import
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li
am: 2fc5c7898a -s ours am skip reason: subject contains skip directive Change-Id: Ibc5aac68049c52a0953e0ba50f8196fefcc57385
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.10Xin Li
Bug: 127812889 Change-Id: I8e8b5ca02fa5eeefa26fcfd82d18b61a500855a3
2019-02-21DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Iacf20e314aed7ad8dd63517c2c920077530527dc
2019-02-11DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li
stage-aosp-master Bug: 124234733 Change-Id: I5d62785cc209b72b920c19f761a9e6de9cd568e8
2019-02-09Snap for 5180536 from 466c50ab5c4943c0c9a139d42a1b4d9af7d65a02 to ↵android-build-team Robot
pi-platform-release Change-Id: Ib826f6b739036760be46fc92949e4f04fc2384c1
2019-01-13[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: e2c985c602 -s ours am skip reason: subject contains skip directive Change-Id: Ifecea50b53ec73a4788724763418b51bc9b1c498
2019-01-13Import translations. DO NOT MERGEpie-b4s4-devBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I01cb129cea53e45d093b1411268b9c077f53f6be
2018-12-25[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: 3d125f433a -s ours Change-Id: Ie3520cccdf3f9f49e76bf109009723d03d7195ba
2018-12-25Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I6c22f8d7081309e491041c18df78c31b7f948a88
2018-12-19Release IllustrationVideoView in onStop. DO NOT MERGEMaurice Lam
am: d3f2b4e9e3 Change-Id: I77ecc2cabf0b520ed18bf4d98d3954dcc046281a
2018-12-14Release IllustrationVideoView in onStop. DO NOT MERGEMaurice Lam
Based on the view's visibility, release or reattach IllustrationVideoView as soon as it becomes invisible to avoid media player resources being held on for a long time, and to avoid multiple video views being released all at once at the end of setup wizard. Test: ./gradlew test connectedAndroidTest Bug: 78360819 Bug: 117581782 Change-Id: Idc5af901122562d12ff3d7b1ee46012b7a60cf25 (cherry picked from commit 6ffb792f4620dcab24f71b24536c1c2d90996a0e)
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 0bfed82090 -s ours am: 0bb6dc8651 -s ours Change-Id: If1d7a7e9e2d127bc6f55826049ac01641c0059e3
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 0bfed82090 -s ours Change-Id: I0cc68643141fa8b526c58eeebede0aa324b12a34
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Bill Yi
Change-Id: Ifa5436e07653d4cadb3d2e8c9992e889825f64ef
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 6f78f47717 -s ours Change-Id: Ib47ed588e9af608d718e6517e820d5b149870967
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Iba4376117001a92891a5e76d3ceafe701063a9e4
2018-10-19Merge pi-dr1-dev to aosp-master am: e0b8834037Bill Yi
am: d5b4c68a0e Change-Id: I23fc826fcb119ac653ce68f70da7820989eeec31
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
am: e0b8834037 Change-Id: I4c8d3b019043df1ca1aaa4b04b961ac02fbfeb89
2018-10-19Merge pi-dr1-dev to aosp-masterBill Yi
Change-Id: Ib3a9fd64b6d49cecea33947cf2a1e3a0c100d4c7
2018-08-29[automerger skipped] Migrate setup-wizard-lib to androidx. am: d533ee27e4 ↵Aurimas Liutikas
-s ours am: 216850a049 -s ours Change-Id: I95ca7e1e7972d08b4bbc58e8222d42555eeeb261
2018-08-29[automerger skipped] Migrate setup-wizard-lib to androidx.pie-tempAurimas Liutikas
am: d533ee27e4 -s ours Change-Id: I2530993e1141a7b63fe3fdaf794fa9e3f3230d24
2018-08-28[automerger skipped] Migrate setup-wizard-lib to androidx.Aurimas Liutikas
am: 9a8a69a845 -s ours Change-Id: I2ac470cd87bf01c6c945f61b36b58451efddecf7
2018-08-28Migrate setup-wizard-lib to androidx.android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseAurimas Liutikas
Test: make setup-wizard-lib Bug: 76692459 Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac Merged-In: I40171e973d442b1a1815e9e7d7c2cc984cb38bac (cherry picked from commit 4860e4ee4876743b52cb03f2fce3c213ad7a2f6a) (cherry picked from commit 939b955af84a69dd027040664725f3c150683076) (cherry picked from commit 9a8a69a8451038325d9b2d2fe3484e54eded1230)
2018-08-28Migrate setup-wizard-lib to androidx.Aurimas Liutikas
Test: make setup-wizard-lib Bug: 76692459 Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac Merged-In: I40171e973d442b1a1815e9e7d7c2cc984cb38bac (cherry picked from commit 4860e4ee4876743b52cb03f2fce3c213ad7a2f6a) (cherry picked from commit 939b955af84a69dd027040664725f3c150683076)
2018-08-27Migrate setup-wizard-lib to androidx.Aurimas Liutikas
Test: make setup-wizard-lib Bug: 76692459 Change-Id: I40171e973d442b1a1815e9e7d7c2cc984cb38bac Merged-In: I40171e973d442b1a1815e9e7d7c2cc984cb38bac (cherry picked from commit 4860e4ee4876743b52cb03f2fce3c213ad7a2f6a)
2018-08-17Convert frameworks/opt/setupwizard to Android.bp am: 7e019cd4afColin Cross
am: c6c41aecf9 Change-Id: Ie40afcb699bee2f73d8918b3ee0a91d35116ed4f
2018-08-17Convert frameworks/opt/setupwizard to Android.bpColin Cross
am: 7e019cd4af Change-Id: I9886c72e7066d8872ceb8ce7e9da93ef0bb310ce
2018-08-17Convert frameworks/opt/setupwizard to Android.bpColin Cross
See build/soong/README.md for more information. Test: m checkbuild Change-Id: I91ea161e67e416811d90854a91016c70dafb8ffb Merged-In: I91ea161e67e416811d90854a91016c70dafb8ffb (cherry-picked from commit d901a55fba2f2a80ec62f21a97cc11f98e8022c1)
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
am: bff87fc0c4 Change-Id: Ib6c9a963944c2353a0ab271a5d7adf707b099b9b
2018-08-13Merge stage-dr1-aosp-master into stage-aosp-masterXin Li
Bug: 112535855 Change-Id: If52bb4da211a25e198c697bb66837b9d5ad1d463
2018-08-07Merge Android Pie into master am: da231a3b6a am: cf908d8d87Xin Li
am: 7b56bdb33b Change-Id: Ife026b8a1f821d47fa6c35734af04fe3ab290756
2018-08-07Merge Android Pie into master am: da231a3b6aXin Li
am: cf908d8d87 Change-Id: I4223fc5f0ab6d5397b4754988e06ccdad79c9332
2018-08-07Merge Android Pie into masterXin Li
am: da231a3b6a Change-Id: I7a5f7d6649706636e0838b5b595a4c615de2c42d
2018-08-06Merge Android Pie into masterandroid-o-mr1-iot-release-1.0.3Xin Li
Bug: 112104996 Change-Id: I127e4e586242f7bb6011cf96a81ea87c2de6acdf
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
am: c5e2c06bca Change-Id: I3b6c0299c668d3b8232325332a759ba1b4dcd3b5
2018-07-19Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-masterXin Li
Bug: 111615259 Change-Id: I53f396c9088201525ec55d039ee523c16dd531e8
2018-06-15Fix ManifestMerger issuesColin Cross
am: 4a5ff8044c Change-Id: I3a250a330cf193fd73a699e5d84d7d3455cccb44
2018-06-15Fix ManifestMerger issuestemp_p_mergeColin Cross
Set LOCAL_MIN_SDK_VERSION in setup-wizard-lib so that the build system doesn't raise the minSdkVersion value specified in the manifest, which causes ManifestMerger to error when trying to merge it into a package that specifies a lower minSdkVersion. Bug: 78447299 Test: m java Change-Id: Ia72327d787c45f6e2f35df97094b92cf6e88e214
2018-06-13Fix Partner.getTextandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-releaseMaurice Lam
Test: ./gradlew test Bug: 109781942 Change-Id: I06c3be06def30803e5dda3069686f0ff510b804d (cherry picked from commit 466c50ab5c4943c0c9a139d42a1b4d9af7d65a02)
2018-06-12Fix Partner.getTextMaurice Lam
am: 466c50ab5c Change-Id: I9be4de6d46052cd7860b0d87dcaf3ba8a4f1e454
2018-06-09Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
am: 4761101d3a Change-Id: Iebc5687a339dfd674a4d58be865dd70485328168
2018-06-09Fix Partner.getTextandroid-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-devMaurice Lam
Test: ./gradlew test Bug: 109781942 Change-Id: I06c3be06def30803e5dda3069686f0ff510b804d
2018-06-08Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li
Bug: 79597307 Change-Id: I1698452e32fc68987f0746459e8762450df9e0cc
2018-05-16Snap for 4784261 from a65273f3bdf0527b101e51b6c5fba0ff51585831 to pi-releaseandroid-build-team Robot
Change-Id: Ifd614b494a473c2aaa886b1e430d91684b91e6b6
2018-05-15Fix SwitchItem clipMaurice Lam
am: a65273f3bd Change-Id: Idfe1e617ec8f8cc406bae8ecec3e708930992fbf
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 16:57:34 +0000