summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gallery2: explicitly include android-support-v7-recyclerviewMichael Bestas2018-04-051-7/+9
| | | | | | * Fixes non-jack build Change-Id: Ic5525736638360777dc6481c22924105f180b1be
* Merge tag 'android-8.1.0_r15' of ↵Michael Bestas2018-04-0567-100/+1014
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD Android 8.1.0 Release 15 (OPM1.171019.021) * Excludes "Adaptive icon for Gallery2 AOSP" since we have our own icon Conflicts: Android.mk AndroidManifest.xml jni/Android.mk jni/filters/geometry.c proguard.flags res/values/colors.xml src/com/android/gallery3d/filtershow/pipeline/Buffer.java Change-Id: I003571ce6e7719e4d110fd9b546126e52eef1204
| * Snap for 4399693 from ee12640ce140c18c6886501c5368859f9ef12cba to oc-mr1-releaseandroid-build-team Robot2017-10-171-1/+1
| |\ | | | | | | | | | Change-Id: I7a2ce27809cb932d69a5984e0478a4f56276ca33
| | * Import translations. DO NOT MERGEBill Yi2017-10-170-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 7367f4e5a3 -s ours Change-Id: I7dbfbb757a7cba4e52d980cd3da96da0339628f5
| | | * Import translations. DO NOT MERGEBill Yi2017-10-163-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I5280cc386023aa6e501dfb2b822341a5491726c6
| | * | Import translations. DO NOT MERGEBill Yi2017-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: Ia18d76d34b86caba45dcba0d61cd006bb2f47352
| * | | release-request-1f2fcfef-9736-44dc-8628-3ba96dac60db-for-git_oc-mr1-release- ↵android-build-team Robot2017-09-172-9/+9
| |\| | | | | | | | | | | | | | | | | | | | | | 4343541 snap-temp-L73700000103533431 Change-Id: I75c77b413ca43351454d967a16a46f33d5e3ee27
| | * | Import translations. DO NOT MERGEBill Yi2017-09-162-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: I750741edd2447f4d5d23e5ec9880c5fd5684d87e
| * | | release-request-81b48854-d0e0-49af-bcf2-857273cbb8dc-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-301-0/+156
| |\| | | | | | | | | | | | | | | | | | | | | | 4306444 snap-temp-L17300000097872583 Change-Id: I3c736f82aef8dbecdeded2787ae455f4d543811a
| | * | Import translations. DO NOT MERGEBill Yi2017-08-291-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import Bug: 64712476 Change-Id: Ia0e39ed10e58d6ac92e90809c6a4bf90507c0ed4
| * | | release-request-a0f7506a-1cd6-4a03-927b-8d29e0c545e6-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-1610-0/+20
| |\| | | | | | | | | | | | | | | | | | | | | | 4277764 snap-temp-L23600000093606242 Change-Id: I713d2ac36756702344bb11b25134f9564c5efc94
| | * | Adaptive icon for Gallery2 AOSPHyunyoung Song2017-08-1510-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 64333648 Test: manual Change-Id: Ifec26c6e5598ab31a73e4e7f090a843f10f63fef
| * | | release-request-ddf09bbc-6509-421f-8fa6-f8ae07cdafea-for-git_oc-mr1-release- ↵android-build-team Robot2017-08-072-1/+290
| |\| | | | | | | | | | | | | | | | | | | | | | 4250733 snap-temp-L31300000089845305 Change-Id: I552d7f731bdda42825e8a93a70837f5db1837eaa
| | * | Import translations. DO NOT MERGEBill Yi2017-08-052-1/+290
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4f5f38b27a36d54517961726cc38da167d3bff22 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
| | * | Import translations. DO NOT MERGEBill Yi2017-08-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | am: 97df95ca14 -s ours Change-Id: Ic10b2ff0619f499aa8e9810837160dff6bd9b4c4
| | | * Import translations. DO NOT MERGEBill Yi2017-08-041-1/+1
| | |/ | | | | | | | | | | | | | | | Change-Id: I0c0ee330a3f53baaa04d0ea6c826cd1752ef1f03 Auto-generated-cl: translation import Exempt-From-Owner-Approval: translation import
| * | release-request-01b39c26-bf86-40a5-a7bf-8eb15c488673-for-git_oc-mr1-release- ↵android-build-team Robot2017-06-081-6/+0
| |\| | | | | | | | | | | | | | | | 4080221 snap-temp-L23400000072087081 Change-Id: I812408b4c66b9bd0e0e2fde93974348386052621
| | * Move <permission> tags to correct parent element am: ba82dd3908Alan Viverette2017-06-061-6/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: d29f35eb4c Change-Id: Icef85c6c1bb2493420301aa33f30f27d8b99bb3a
| | | * Move <permission> tags to correct parent elementAlan Viverette2017-06-061-6/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | am: ba82dd3908 Change-Id: I235e92d4a0dca03d86e2e18f4caeed6ce95e211c
| | | | * Move <permission> tags to correct parent elementAlan Viverette2017-06-051-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AAPT2 is stricter about enforcing correctness, and the permission tags were in the wrong place. Fixes: 62262214 Test: builds with AAPT2 Change-Id: I20fb827f81d9b57404c6c02bdfa27acf3e572c90
| * | | | release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release- ↵android-build-team Robot2017-05-173-10/+11
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4017779 snap-temp-L47900000064949209 Change-Id: I1b6afa464a22252d4caeb7cf46a3f9203d466f9c
| | * | | Merge "Fix makefile include for support-v4" into oc-dev am: 49496305faAlan Viverette2017-05-111-2/+3
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | am: eee8680939 Change-Id: I173a593c8cd71e6cfdb47c6d9aadf8d99dc6c323
| | | * | Merge "Fix makefile include for support-v4" into oc-devAlan Viverette2017-05-111-2/+3
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 49496305fa Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3
| | | | * Merge "Fix makefile include for support-v4" into oc-devTreeHugger Robot2017-05-111-2/+3
| | | | |\
| | | | | * Fix makefile include for support-v4Alan Viverette2017-05-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: make Gallery2 Change-Id: I361d0844f8c71ca4a258ede082d18edf06224c9a
| | * | | | Import translations. DO NOT MERGE am: 907cd0546f -s oursBill Yi2017-05-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bd69754242 -s ours Change-Id: If20c21868d46d6db2385501531b2a1cb29c0a950
| | | * | | Import translations. DO NOT MERGEBill Yi2017-05-110-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 907cd0546f -s ours Change-Id: I6fd4d51f07fb762db5650f690aaa5985b1aa0f9d
| | | | * | Import translations. DO NOT MERGEBill Yi2017-05-102-8/+8
| | | | |/ | | | | | | | | | | | | | | | | | | | | Change-Id: Ib4083351435abccd9a56eb63896203538fa726b4 Auto-generated-cl: translation import
| | * | | Import translations. DO NOT MERGEBill Yi2017-05-042-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I210fbd127c6055d3c45e24aa03fbbb3e463f9399 Auto-generated-cl: translation import
| | * | | Import translations. DO NOT MERGEThe Android Open Source Project2017-05-022-4/+4
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ie07649e78ca2753c896ef259a7eaf1e97a1c9c94 Auto-generated-cl: translation import
| * | | Fix proguard failure when using javac am: 084ef10d7dAlan Viverette2017-04-271-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | am: f62a9d75db Change-Id: I9cc4269d87a884d0e66adc8ec78d71f06eefa03d
| | * | Fix proguard failure when using javacAlan Viverette2017-04-271-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | am: 084ef10d7d Change-Id: I9da2eb3cf5f0b890992eab29f83a2368cae71190
| | | * Fix proguard failure when using javacAlan Viverette2017-04-271-2/+4
| | | | | | | | | | | | | | | | | | | | Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999
| * | | Use explicit support library prebuilts am: 0673572ff9Alan Viverette2017-04-211-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | am: c66df7ddf9 Change-Id: I79e0d55d015d029f331e79e442f60ccfa6a04143
| | * | Use explicit support library prebuiltsAlan Viverette2017-04-211-2/+2
| | |\| | | | | | | | | | | | | | | | | | | | | am: 0673572ff9 Change-Id: I151e95a4943294d0c1a8f2f8565f4ef79b16f610
| | | * Use explicit support library prebuiltsAlan Viverette2017-04-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Test: make Gallery2 Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03
| * | | Fix build Gallery2 am: a611ca04d2Seigo Nonaka2017-04-211-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | am: a86c0f3f29 Change-Id: Ib297115644b34179601c24c2976f0f7ca3a51e19
| | * | Fix build Gallery2Seigo Nonaka2017-04-211-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | am: a611ca04d2 Change-Id: I569529ea748c770b12932ab2ec61a28c03dcbf4c
| | | * Fix build Gallery2Seigo Nonaka2017-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Test: N/A Bug: N/A Change-Id: I1822b79d421c025d3be63af040849bde7397ac25
| * | | Revert setting Werror flag - there are still warnings on some builds.Tomasz Wasilczyk2017-04-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I94a2c0f5885e19d186506062e67d538ae3c7bf09 Test: it builds. Bug: b/37159108
| * | | Fix warnings and set Werror flag to not let them happen again.Tomasz Wasilczyk2017-04-0713-32/+27
| | | | | | | | | | | | | | | | | | | | | | | | Test: it builds. Bug: b/37159108 Change-Id: I898f5de0f8e992404977d4958b8dd44af4aea9fe
| * | | Import translations. DO NOT MERGE am: 5ffe930607 -s ours am: 14eaf78900 -s ↵Bill Yi2017-04-020-0/+0
| |\| | | | |/ | |/| | | | | | | | | | | | | | | | ours am: 42d6db3c59 -s ours Change-Id: I0c1d7a0e41a7f8ad09d73a32dbfa29aee3abc6e0
| | * Import translations. DO NOT MERGE am: 5ffe930607 -s oursBill Yi2017-04-020-0/+0
| |/| | | | | | | | | | | | | | | | am: 14eaf78900 -s ours Change-Id: Ic8fe7f9446e65a9e26c46e5989655985018c0bef
| | * Import translations. DO NOT MERGEBill Yi2017-04-020-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | am: 5ffe930607 -s ours Change-Id: Iaf6552a6a14beb2dc5504a7229549a8ff36a6c0a
| | | * Import translations. DO NOT MERGEBill Yi2017-04-0112-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 36832302 Change-Id: Ie89627c154c5615de8cea71fb1044237a22754ef
| * | | Import translations. DO NOT MERGEBill Yi2017-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea7efcca8eecc21cdf8eda27a4e664365f2a1f5f Auto-generated-cl: translation import
| * | | Merge "Stop using junit classes in production" am: f1ec8df547 am: d382e794e9Paul Duffin2017-02-215-14/+12
| |\| | | | | | | | | | | | | | | | | | | | | | am: 508d9e47f4 Change-Id: I1fa8a30c27e462604b1625d6f78031a12117f640
| | * | Merge "Stop using junit classes in production" am: f1ec8df547Paul Duffin2017-02-215-14/+12
| | |\| | | | | | | | | | | | | | | | | | | | | am: d382e794e9 Change-Id: I43e1638614a6076b0a664352367adce76cf80787
| | | * Merge "Stop using junit classes in production"Paul Duffin2017-02-215-14/+12
| | |/| | | | | | | | | | | | | | | | | | | | | am: f1ec8df547 Change-Id: If020e58b695e143378fde0bbe804678e74b2c905
| | | * Merge "Stop using junit classes in production"Paul Duffin2017-02-215-14/+12
| | | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 02:34:21 +0000