summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: db8640b3a5 Change-Id: I1e484d53a35cc29eb287456e81884dfffb38e394
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: Iea225ccac1abcab67b9c83825e0557aa3e090f42 BUG: 129345239
2019-03-28Support isSetupFlow extra in the deprecated setupwizardlib libraryCyril Lee
The isSetupFlow extra is introduced in SetupCompat/SetupDesign library. However, the client use this setupwizardlib library will lead WizardScriptHelper#isAnySetupWizard() of SetupCompat not work from Android Q since isSetupFlow extra will be truncated. Success log for after patching setupwizardlib and replacing FactoryOta http://gpaste/5367975093731328 Bug: b/129445834 Test: mma and manual test Change-Id: Ia5ba16d2bf3d3b3e489a52369f234819165d5de7
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
2fc5c7898a -s ours am: 17da719d0f -s ours am: aee7e6e858 -s ours am skip reason: subject contains skip directive Change-Id: I1d4acfc0497cd87a3c227a8ceb1e910a36615dae
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
2fc5c7898a -s ours am: 17da719d0f -s ours am skip reason: subject contains skip directive Change-Id: I3dd888d1baf473a652ffcc7cc505ad4821f82296
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-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: 6b729f3af8 Change-Id: I9fe086e38f8004a79c5b090e7215d84ecd2bc257
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ic4892188205f92a2ff13c7e185edcc775f1bc065
2019-02-21DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Iacf20e314aed7ad8dd63517c2c920077530527dc
2019-02-16[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev ↵Bill Yi
am: e6cde6e1ef -s ours am: f4f1ae93d4 -s ours am skip reason: subject contains skip directive Change-Id: Iad894bac5d8d2b3113a22ab6a96367216586ea93
2019-02-16[automerger skipped] Import translations. DO NOT MERGE am: df9c98f856 -s oursBill Yi
am: f1ef444128 -s ours am skip reason: subject contains skip directive Change-Id: I83e50bb9d016b4d9f5fdf1b2cd0d24cf3c915eae
2019-02-16[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-devBill Yi
am: e6cde6e1ef -s ours am skip reason: subject contains skip directive Change-Id: I244af3f5f86162bbf55f4ce64deaed6397b946e1
2019-02-16[automerger skipped] Import translations. DO NOT MERGEBill Yi
am: df9c98f856 -s ours am skip reason: subject contains skip directive Change-Id: Idf0c523b6831c821423713e9c386126996f7ade6
2019-02-16Merge "Import translations. DO NOT MERGE" into pi-devandroid-9.0.0_r47android-9.0.0_r45android-9.0.0_r42pie-qpr3-b-releaseTreeHugger Robot
2019-02-15Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: I9005042d6d3fdd8be55c2775a9fd1bf39ff3bf4a
2019-02-15Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ifd0ee5103ccbc319d55f27f5cc2978eddc152bd0
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 912c83a836 -s ours am: ab5d58c892 -s ours am skip reason: subject contains skip directive Change-Id: I1b402444d68dcdeb9ca91d99c4fd4e0a150e65b0
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 912c83a836 -s ours am skip reason: subject contains skip directive Change-Id: Ib671447dc404b1f344dc1bf94a5ee7bab47d0aad
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-02-02Import translations. DO NOT MERGEBill Yi
Change-Id: I7c658a65c5299b6ace02a478289a0a7e910874e7 Auto-generated-cl: translation import
2019-01-13[automerger skipped] Import translations. DO NOT MERGE am: e2c985c602 -s oursBill Yi
am: ab0c326b47 -s ours am skip reason: subject contains skip directive Change-Id: Iaedab930dc0c17c4af3e09ccc4a2c03df6b3fdff
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-26Merge "Import translations. DO NOT MERGE"TreeHugger Robot
2018-12-25[automerger skipped] Import translations. DO NOT MERGE am: 3d125f433a -s oursBill Yi
am: af96b3c7b3 -s ours Change-Id: I23852635b1028400932b96f2f31a70d204ac0f2d
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-25Import translations. DO NOT MERGEBill Yi
Change-Id: Iaf1bf87c6b64b5192cc81c87432cc7ee66ed99df Auto-generated-cl: translation import
2018-12-19[automerger skipped] Release IllustrationVideoView in onStop. DO NOT MERGE ↵Maurice Lam
am: d3f2b4e9e3 am: 8344e75310 -s ours Change-Id: I3a542d99ff4b98cbb1d3ea6533f64b8bcaa50339
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-12-11Import translations. DO NOT MERGEBill Yi
Change-Id: Iee0c1c9e69166c75a1ff38921bef6cd2b0983278 Auto-generated-cl: translation import
2018-12-06Remove obsolete navigation bar projectMaurice Lam
Clients should be using setup wizard lib (for a long time now). Test: TreeHugger Change-Id: I44083c663155590e049f03f4dc9bf7758dd15a70
2018-10-31Import updated Android Setup Wizard Library 216634194Setup Wizard Team
PiperOrigin-RevId: 216634194 Change-Id: I0a942bf9475129aebb77110e121b1b08af3cfe96
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 am: 68f7ee04af -s ours Change-Id: I9e7a62cbc4630608f4a94a5274e8260721f307f6
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 am: 1110fda445 -s ours Change-Id: If557884ff6e2f792f694a2079fa7278cfc2341a1
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: e0b8834037 am: d5b4c68a0eBill Yi
am: acab680694 Change-Id: Ia8080d072ca816912ed949805f974810ceca88c8
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-10-10Import updated Android Setup Wizard Library 216631487Setup Wizard Team
PiperOrigin-RevId: 216631487 Change-Id: I99d2441dff841fa14517e8c53368a0ce40f6ee2d
2018-10-01Remove style checks and upgrade RobolectricSetup Wizard Team
Bug: 112048937 Test: ./gradlew test Change-Id: I4aa4bda4d5b422c49bada65f9e27bffc931bac15
2018-10-01Import updated Android Setup Wizard Library 210155157Setup Wizard Team
PiperOrigin-RevId: 210155157 Change-Id: I707512aab6ac57aaebb93275669ae16b92b0e66d
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 05:28:39 +0000