summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-087-51/+94
|\ | | | | | | | | | | Bug: 168057903 Merged-In: I5667593cf89e4432861a5033ea57281507ddce74 Change-Id: Icb2a984c9d631291971f5e5f3961b0797371cbf2
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-277-51/+94
|/| | | | | | | | | | | Bug: 166295507 Merged-In: I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6 Change-Id: I5667593cf89e4432861a5033ea57281507ddce74
| * Add an exported flag in manifest am: 65911c0797 am: b82ed64e09Ashwini Oruganti2020-05-201-0/+3
| |\ | |/ |/| | | Change-Id: I5a6abeeeab91e9f2ce7e6f49e863d76f21bd44d6
* | Add an exported flag in manifest am: 65911c0797android-r-beta-3android-r-beta-2Ashwini Oruganti2020-05-201-0/+3
|\ \ | | | | | | | | | Change-Id: If2788ed76fea75d5d43c0701b7e8314abe613b25
| * | Add an exported flag in manifestAshwini Oruganti2020-03-231-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With b/150232615, we will need an explicit value set for the exported flag when intent filters are present, as the default behavior is changing for S+. This change adds the value reflecting the previous default to the manifest. These changes were made using an automated tool, the xml file may be reformatted slightly creating a larger diff. The only "real" change is the addition of "android:exported" to activities, services, and receivers that have one or more intent-filters. Bug: 150232615 Test: TH Exempt-From-Owner-Approval: mechanical refactoring Change-Id: If38c307287b4cad5e5a66c079b96262eb85bf801
| * [automerger skipped] Updating VideoPlayer as per androidx.media library ↵android-mainline-11.0.0_r1android11-mainline-releaseandroid11-devSunny Goyal2019-11-190-0/+0
| |\ | |/ |/| | | | | | | | | | | | | changes am: 08320e11d6 am: 287097108b am: 73aa04b463 -s ours am skip reason: change_id I814a25181c27bab73c146d5eb117d56f3264452c with SHA1 197cc87be8 is in history Change-Id: I7b1c7b957daadf76cd60aba824d419ef587597a6
* | Updating VideoPlayer as per androidx.media library changes am: 08320e11d6android-r-preview-4android-r-preview-3android-r-preview-2Sunny Goyal2019-11-184-40/+56
|\ \ | | | | | | | | | | | | | | | am: 287097108b Change-Id: Ie3139884815b51f5c45f504ded4358e91fb44d5e
| * \ Updating VideoPlayer as per androidx.media library changesandroid-r-preview-1Sunny Goyal2019-11-184-40/+56
| |\ \ | | | | | | | | | | | | | | | | | | | | am: 08320e11d6 Change-Id: I4b6c4cc2857196b5f8e07a0a7608f31d2eba4ed0
| | * | Updating VideoPlayer as per androidx.media library changesSunny Goyal2019-11-144-40/+56
| | | | | | | | | | | | | | | | | | | | Change-Id: I814a25181c27bab73c146d5eb117d56f3264452c Merged-In: I814a25181c27bab73c146d5eb117d56f3264452c
| | | * [automerger skipped] Apply androidx.media2.* library/package separation to ↵Insun Kang2019-11-190-0/+0
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | pump app am: 862df21538 am: 4e72d86717 am: ff85df5beb -s ours am skip reason: change_id Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf with SHA1 ec423bc6b3 is in history Change-Id: I4498bb79617ea0b38659f0fc4358497021317c5b
* | | | Apply androidx.media2.* library/package separation to pump app am: 862df21538Insun Kang2019-11-182-8/+10
|\| | | | | | | | | | | | | | | | | | | | | | | am: 4e72d86717 Change-Id: I18e3c9cc4c31f898b6ae8e760a65be9a74dce5b9
| * | | Apply androidx.media2.* library/package separation to pump appInsun Kang2019-11-182-8/+10
|/| | | | |/ / | | | | | | | | | | | | am: 862df21538 Change-Id: I879990fe5dc530ef326010b78346e6415a7b31a1
| * / Apply androidx.media2.* library/package separation to pump appInsun Kang2019-11-142-8/+10
|/ / | | | | | | | | | | | | Bug: 132639390 Test: Build successful Change-Id: Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf Merged-In: Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf
| * Updating VideoPlayer as per androidx.media library changesSunny Goyal2019-08-024-40/+56
| | | | | | | | Change-Id: I814a25181c27bab73c146d5eb117d56f3264452c
| * Apply androidx.media2.* library/package separation to pump appInsun Kang2019-05-152-8/+10
| | | | | | | | | | | | Bug: 132639390 Test: Build successful Change-Id: Id6dbfedb0ca3b39e992c53ad5a0903c8c082a8bf
| * Fix thumbnail & album art loading on QChristofer Åkersten2019-04-117-51/+94
| | | | | | | | | | | | | | Bug: 128917398 Bug: 123707512 Test: Manual on P & Q Change-Id: I81dd2c7b23a2a9be360d5f44b8f798e8b108952b
| * Removes context from UriMediaItem am: e549c4eda2Louis Pullen-Freilich2019-04-092-2/+2
| |\ | |/ |/| | | | | | | am: 427f305c03 Change-Id: Ie8a49b051c89b3b362c1e0f43e963d60bcb4ef72
* | Removes context from UriMediaItemplatform-tools-29.0.5android-mainline-10.0.0_r11ndk-sysroot-r21android10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseLouis Pullen-Freilich2019-04-092-2/+2
|\ \ | | | | | | | | | | | | | | | am: e549c4eda2 Change-Id: I72f3cfd819803a5ff8445c658a99bf396e034f70
| * | Removes context from UriMediaItemandroid-mainline-10.0.0_r9android-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-releaseLouis Pullen-Freilich2019-04-052-2/+2
|/ / | | | | | | | | | | | | | | | | This was removed upstream, and so this is currently blocking importing new AndroidX prebuilts to platform. Bug: b/127299117 Test: m -j Change-Id: I02da1ca1fbafae8505d4b0702308daaedd04bd6c
| * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-030-0/+0
|/| | | | | | | | | | | am: c1f839dd33 Change-Id: Ic490fac54ccb2895fff371bba05192e6ad21502c
| * Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur2019-04-027-55/+80
| |\ | |/ |/| | | | | Change-Id: Ie0b2fe8bc2633b30edd319b09e2596ffa6d5d5cb BUG: 129345239
* | Remove URI from Audio/VideoChristofer Åkersten2019-03-287-42/+18
| | | | | | | | | | | | Test: manual Bug: 128868297 Change-Id: I4e55e7473effe12eea22b6b8a8ed87d3215268ab
* | Use RELATIVE_PATH / DISPLAY_NAME instead of DATA on QChristofer Åkersten2019-03-281-9/+52
| | | | | | | | | | | | Bug: 128868297 Test: Manual (on P & Q devices) Change-Id: I19810f21bab1f6ddc1818f51ab7a6fe252267af6
* | Fix artist to album link on Q devicesChristofer Åkersten2019-03-201-5/+11
|/ | | | | | | | | | In Q a bug in MediaStore is fixed where artist to album mapping was keyed with _id column rather than album_id. This changes so we prefer the album_id column but resort to _id if not found. Bug: 128918172 Test: Manual test on P & Q devices Change-Id: If01eb7b3d64160eb3d08c3e61f36097a9576c397
* Catch exceptions from starting/started activitiesChristofer Åkersten2019-03-196-8/+207
| | | | | | | | | - Catches ActivityNotFoundException and SecurityException - Adds intermediary activity for suppressing crashes Bug: 126568571 Test: manual Change-Id: I08b78cb4659c1614561402dea9449263b177d062
* Merge "[KG Integration] Merge multiple types into one query"TreeHugger Robot2019-03-161-27/+9
|\
| * [KG Integration] Merge multiple types into one queryJin Seok Park2019-03-151-27/+9
| | | | | | | | | | | | | | | | Also throws IOException for caught JSONExceptions. Bug: 123034216, Bug: 123034993 Test: manually Change-Id: Ie30cafe5a0515794ec20ed92fa145a7fd99d5a6e
* | Merge "[KG Integration] Retrieve album metadata"TreeHugger Robot2019-03-166-69/+143
|\|
| * [KG Integration] Retrieve album metadataJin Seok Park2019-03-156-69/+143
| | | | | | | | | | | | Bug: 123035885, Bug: 123035274 Test: manually Change-Id: I915e3ebf06574b31dcd9a73283ce4e873197fd43
* | Show permission request for all tabsChristofer Åkersten2019-03-141-28/+12
| | | | | | | | | | | | Bug: 123328776 Test: manual Change-Id: I1dbd76b958108eeb2a5447d5dd67c1e8d192c06c
* | Show system properties if user denied permission permanentelyChristofer Åkersten2019-03-143-95/+87
|/ | | | | | Bug: 126900544 Test: manual Change-Id: Ida9e440f3e014a0555d88df5272938591b88d637
* Merge "Change color of "Allow Access" button"TreeHugger Robot2019-03-061-1/+1
|\
| * Change color of "Allow Access" buttonChristofer Åkersten2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | Red-line missing, so choose a color that closely matches the mockup. Bug: 127529171 Test: manual Change-Id: I587e8735a8e11226a3a85b69e9227639d97f4b19
* | Implement series detail activityChristofer Åkersten2019-03-0510-25/+426
| | | | | | | | | | | | Bug: 123035784 Test: manual Change-Id: I83593db6c9ed207d468d3dd13d1a14793c74da35
* | Merge "Avoid NPE in genre details"TreeHugger Robot2019-03-061-1/+1
|\ \
| * | Avoid NPE in genre detailsChristofer Åkersten2019-03-051-1/+1
| |/ | | | | | | | | Test: manual Change-Id: Ib37c56ff913c75bee2ec8a6de3997d89a0db2284
* | Merge changes I4cee9ec1,I66eb8ed2TreeHugger Robot2019-03-064-68/+281
|\ \ | | | | | | | | | | | | | | | * changes: Less ugly hack for the permission page Add permission request UX
| * | Less ugly hack for the permission pageChristofer Åkersten2019-03-051-40/+79
| | | | | | | | | | | | | | | | | | Bug: 123328776 Test: manual Change-Id: I4cee9ec19f0de0e801ca884358c52e1ef2404bd9
| * | Add permission request UXChristofer Åkersten2019-03-054-41/+215
| |/ | | | | | | | | | | Bug: 123328776 Test: manual Change-Id: I66eb8ed2f3f31ed95050860154f0fc1aa1a562ff
* | Merge "Remove unused code from playlist details"TreeHugger Robot2019-03-061-6/+0
|\ \
| * | Remove unused code from playlist detailsChristofer Åkersten2019-03-051-6/+0
| |/ | | | | | | | | Test: manual Change-Id: Iaedea9d8c7a7104aa0a931319c4f6b24e7256c1c
* | Merge "Use Gradle 3.3.2"TreeHugger Robot2019-03-061-1/+1
|\ \
| * | Use Gradle 3.3.2Christofer Åkersten2019-03-051-1/+1
| |/ | | | | | | | | Test: build Change-Id: If2a9143d5a3aac4c6e766d07aea6e1f745ad6b70
* / [KG Integration] Retrieve artist metadataJin Seok Park2019-03-056-37/+135
|/ | | | | | | | | | | Retrieving logic is same with previous CLs, but artist can be of either "Person" or "MusicGroup" type. Also added some audio test files in Patch 2. Bug: 123034993, Bug: 123034216 Test: manually Change-Id: I47674b89c47be3633428c6b194cdf35331900d9f
* Add connection from Album/Artist back to AudioChristofer Åkersten2019-02-279-53/+53
| | | | | Test: manual Change-Id: Ib726931c8494dd20e935ceeabda800f9ff895ff8
* Add music detailsChristofer Åkersten2019-02-279-24/+1164
| | | | | | Test: manual Bug: 122924230 Change-Id: I647f8d34eaae1f142d1fcb5ff4dd2dfc95fd855a
* Merge "Remove unnecessary explicit library dependencies"TreeHugger Robot2019-02-261-2/+0
|\
| * Remove unnecessary explicit library dependenciesChristofer Åkersten2019-02-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | We already have implicit dependencies to AndroidX libraries; this change reduces the number of explicit dependencies to the bare minimum and completely relies on implicit dependencies. This also changes so build.gradle and Android.bp list the same dependencies. Test: build & run Change-Id: I1195acc94bd67d5692ad2b4dd1e27be34a90f5ec
* | Specify SDK versions in makefileChristofer Åkersten2019-02-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Also makes the app runnable on non-Q devices. (SDK version 'current' requires a pre-release build.) Note min SDK is currently set to 24 as: - 19~20 fails with dex-limit error - 19~23 warns when desugaring media2-exoplayer Test: build & run Bug: 123716038 Change-Id: I7d0edda2160d0611b19fe8da1df45fd3b4153a3a
* | Restore selected tab when switching viewsChristofer Åkersten2019-02-221-40/+66
|/ | | | | | | | Restores previously selected tab when switching views in the bottom navigation view. Test: manual Change-Id: Ic2437cd8eb2a5b940982e35a9b6ace3af9aaf8d0