summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am de02034f: am 944fb730: am 419fb50c: Merge "Update system images to ↵Bo Hu2015-10-097-7/+7
|\ | | | | | | | | | | | | revision 4" into mnc-dev * commit 'de02034f6f289945691eeec4fb89d35804198eea': Update system images to revision 4
| * am 944fb730: am 419fb50c: Merge "Update system images to revision 4" into ↵Bo Hu2015-10-097-7/+7
| |\ | | | | | | | | | | | | | | | | | | mnc-dev * commit '944fb7302582f6626ca4fd3ba6c7a41ce86abcbc': Update system images to revision 4
| | * am 419fb50c: Merge "Update system images to revision 4" into mnc-devBo Hu2015-10-097-7/+7
| | |\ | | | | | | | | | | | | | | | | * commit '419fb50cad5ca8cadb45c26552fd767109474315': Update system images to revision 4
| | | * Merge "Update system images to revision 4" into mnc-devBo Hu2015-10-097-7/+7
| | | |\
| | | | * Update system images to revision 4bohu2015-09-117-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibdbc001c84f9a9c159ae76f657944e05941136f8
* | | | | SupportLeanbackShowcase: get rid of card view background overdrawDake Gu2015-10-085-52/+66
| | | | | | | | | | | | | | | | | | | | Change-Id: I3a46d34df265eda2cf38bfca80d3786aa5a8a23b
* | | | | Merge "Support7Demos: Update the MediaRouter demo" into mnc-ub-devJae Seo2015-10-0715-64/+212
|\ \ \ \ \
| * | | | | Support7Demos: Update the MediaRouter demoJae Seo2015-10-0715-64/+212
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I661e17073bd71e45610360bbf5b372eaf41c4fe3
* | | | | | SupportLeanbackShowcase: performance fix of ImageCardView resourceDake Gu2015-10-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Picasso to load Image in background thread instead of decoding Bitmap in UI thread. Change-Id: Ib798d167108f8445b3898cab72dc7dfabfe13c8a
* | | | | | SupportLeanbackShowcase: dont expand side infoDake Gu2015-10-051-12/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transition animation isn't right. Browse fragment hasn't implemented the pre-layout for row children horizontal layout change. Change-Id: Ib4f55651c3f568ad9224c474036663f35935c4e3
* | | | | Leanback Demo: demo of edit titleDake Gu2015-10-054-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 24673827 Change-Id: I1e4d9378cc862d748055387a71129692bd4cf53b
* | | | | Supportleanbackshowcase: Polishing 2 and transition performance fixDake Gu2015-10-015-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move background of browse/details/music from layout to windowBackground. Setting background on view will cause the whole RelativeLayout being faded in while transition move content inside the RelativeLayout. The RelativeLayout does not have a hardwarelayer, nor does it specify hasOverlappingRendering=false. This falls to the slowest rendering path. Change-Id: I78bacc965e641d7f960aae5cf212c29f6b1f0f11
* | | | | Supportleanbackshowcase: PolishingDake Gu2015-10-015-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support staggered slide in/out transition for VerticalGrid. Move background from layout file to windowBackground in theme. Defining background on view conflicts with transitions. Change-Id: If823f492fd5bdd0b16c1d1e735f4214f925f3ae3
* | | | | Merge "Showcase: Update SDK to 23 and support lib to 23.0.1" into mnc-ub-devDake Gu2015-10-017-61/+14
|\ \ \ \ \
| * | | | | Showcase: Update SDK to 23 and support lib to 23.0.1Dake Gu2015-10-017-61/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated for new API addAsRoot() for GuidedStepFragment. Rmove the awkward setStep() call, we can find current GuidedStepFragment using standard API. Change-Id: I7ecb108a36ab5d0091c230dd5c5686e3a91f1857
* | | | | | GuidedStepFragment Subclass need explcitly specify a container id for backgroundDake Gu2015-10-012-6/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | After fixed Bug 24570987 Change-Id: I1ec51f8ea39b21e4d547e923386dd357a538ff4a
* | | | | Merge "Generate test for PlaybackOverlaySupportFragment" into mnc-ub-devDake Gu2015-10-0110-2/+571
|\ \ \ \ \
| * | | | | Generate test for PlaybackOverlaySupportFragmentDake Gu2015-09-3010-2/+571
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3064006f3fb3fc4fd5230ff3ab24a7c4ba2470f
* | | | | | Merge "Generate support version of leanback fragment tests" into mnc-ub-devDake Gu2015-10-0128-20/+1889
|\| | | | |
| * | | | | Generate support version of leanback fragment testsDake Gu2015-09-3028-20/+1889
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all leanback support version of fragment except PlaybackOverlayFragment missing a support version of PlaybackControlHelper. Change-Id: Icb5c99e8677630e8541b22b009051dd3908d4f35
* | | | | | Add usage of app:actionLayout in NavigationViewYuichi Araki2015-09-292-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia89c13233226bebba9a0d0bde57f183debd85ba4
* | | | | | am 6e0718b2: am 28c3c333: am 82336df0: Pass in current android.jar to ↵Tor Norbye2015-09-270-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | api-generator * commit '6e0718b2ccc9bb11435506222d07ba518a23913b': Pass in current android.jar to api-generator
| * | | | | am 28c3c333: am 82336df0: Pass in current android.jar to api-generatorTor Norbye2015-09-271-2/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '28c3c33391efeaf2d19f2d9db7eb49de34a44a59': Pass in current android.jar to api-generator
| | * | | | am 82336df0: Pass in current android.jar to api-generatorTor Norbye2015-09-271-2/+5
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '82336df0c11445ba7ce6228bb4983a914328c710': Pass in current android.jar to api-generator
| | | * | | Pass in current android.jar to api-generatorTor Norbye2015-09-261-2/+5
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the api-versions.xml shipped with the SDK always includes the correct latest API data (see http://b.android.com/183500) Change-Id: I96a6b0218abeaf3865a49de0fdd2be933f88c469 (cherry picked from commit fbe6c8105a6cbd880ff50d9799e23cf1790f1301)
* | | | | RecyclerView in place animationsYigit Boyar2015-09-235-48/+267
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 22507896 Change-Id: I0344348011c412ea00b97eec97fa8d566bb09c7e
* | | | Merge "Generate example of GuidedStepSupportFragment" into mnc-ub-devDake Gu2015-09-235-0/+314
|\ \ \ \
| * | | | Generate example of GuidedStepSupportFragmentDake Gu2015-09-215-0/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21504593 Change-Id: Ifafc4a956060def75bc01d45eeb568d3077a977e
* | | | | Revert "Revert "Add example of vertical grid transition and GuidedStepFragment""Dake Gu2015-09-228-35/+80
| | | | | | | | | | | | | | | | | | | | This reverts commit c1e0465a059a8636c257f4a90149d48c67cb0cbf.
* | | | | Merge "Revert "Add example of vertical grid transition and ↵Dake Gu2015-09-218-80/+35
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | GuidedStepFragment"" into mnc-ub-dev
| * | | | Revert "Add example of vertical grid transition and GuidedStepFragment"Dake Gu2015-09-218-80/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7b42f57cdaf6b4176414a75268af1087169b1090. Change-Id: Id6abde83749952818e39a5b4b61c923052aee569
* | | | | Merge "Add example of vertical grid transition and GuidedStepFragment" into ↵Dake Gu2015-09-218-35/+80
|\| | | | | | | | | | | | | | | | | | | mnc-ub-dev
| * | | | Add example of vertical grid transition and GuidedStepFragmentDake Gu2015-09-148-35/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added example of vertical grid transition Added example of launching GuidedStepFragment from BrowseFragment. Also fixed couple bug in GuidedStepActivity: 1. All fragment class should be public 2. Remove argument from constructor. Pass Arguments instead. Bug: 23319507 Change-Id: Ia7b8d6669445be62f8f2a325cc460021ca392ded
* | | | | am 0544c15c: (-s ours) am 991947ef: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '0544c15c4c21b477a478f03aa4c7e8622be922e9': Import translations. DO NOT MERGE
| * | | | am 991947ef: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-180-0/+0
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | * commit '991947efccc5d6d6de9c21a9548a0ff143e51e84': Import translations. DO NOT MERGE
| | * | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+8
| |/ / | | | | | | | | | | | | Change-Id: I52f9e0ca4704f52015b44af909c18b966f03ff05 Auto-generated-cl: translation import
* | | Merge "Add snapping scroll example to SupportDesignDemos" into mnc-ub-devChris Banes2015-09-104-0/+86
|\ \ \
| * | | Add snapping scroll example to SupportDesignDemosChris Banes2015-09-044-0/+86
| | |/ | |/| | | | | | | | | | BUG: 23792717 Change-Id: Ida0ba53fdf14534daa5a2a61ba5c035a1b782e82
* | | Update platform-tools version to 23.0.1Tor Norbye2015-09-091-1/+1
| | | | | | | | | | | | Change-Id: I7e2a9dd15793f3fde1be81b8eb987bc93746632e
* | | Add proguard configuration to support design demos sample appMady Mellor2015-09-092-0/+8
| | | | | | | | | | | | | | | | | | | | | Proguard was stripping out the coordinator layout behavior and the linear layout manager classes. Change-Id: Ibe72d5952bee20cf386e7384e261f46eea1cb67d
* | | Add DrawableCompat demo to Support4DemosChris Banes2015-09-0410-0/+167
|/ / | | | | | | Change-Id: Ie00198b1d4dbc0c71084961eee2387a68e39505f
* | Fix typo in SDK generationTony Mantler2015-08-311-4/+4
| | | | | | | | Change-Id: I5658bcfc1910562f17d094e81dc60a7c74a4467c
* | Add preference and recommendation libs to SDK buildTony Mantler2015-08-282-0/+20
| | | | | | | | Change-Id: I00c716c42ffbd04b382b1b3016fcc19e9321ae48
* | Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-devJae Seo2015-08-284-40/+0
|\ \
| * | MediaRouter: Remove uses of not-yet-public APIJae Seo2015-08-274-40/+0
| | | | | | | | | | | | Change-Id: I05949c75081fc963fe4b025f6f4db13d0255eeef
* | | am 14e48160: Merge "Bump support library version to 23.0.1 DO NOT MERGE" ↵Chris Flatt2015-08-271-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into mnc-dev * commit '14e48160d2382c499a4abd0ebd90564881643215': Bump support library version to 23.0.1 DO NOT MERGE
| * | Merge "Bump support library version to 23.0.1 DO NOT MERGE" into mnc-devChris Flatt2015-08-271-1/+1
| |\ \
| | * | Bump support library version to 23.0.1 DO NOT MERGEChris Flatt2015-08-271-1/+1
| | | | | | | | | | | | | | | | Change-Id: I268eea0b49a9bf611e36bb9cc5d91adf2a2ff01e
* | | | am e226a0f5: Add customtabs support lib to extras/android/support/Yusuf Ozuysal2015-08-272-1/+4
|\| | | | | | | | | | | | | | | | | | | * commit 'e226a0f56949b1d6ab97a31ed987adb7f7513be9': Add customtabs support lib to extras/android/support/
| * | | Add customtabs support lib to extras/android/support/Yusuf Ozuysal2015-08-272-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the only way to get access to customtabs library through download m2repository and using the aar file whereas all other support libs are also present in extras/android/support/ with the corresponding resources and jar file. This adds the jar and manifest to the corresponding folder to avoid the confusion to developers. This is relanding https://googleplex-android-review.git.corp.google.com/#/c/756492/ after it was reverted due to not having the corresponding Android.mk change. Change-Id: I21969994e1dd0bb4f9abbfa395cf284e3cfc396d