Jae Seo
2fdebc7a65
resolve merge conflicts of 8fb40bb to nyc-dev-plus-aosp
...
Change-Id: Ie6ad6680b76abfb882189853a2e43213b76162fd
2016-04-21 15:38:48 -07:00
Jae Seo
315bda0ab5
Add missing LOCAL_MIN_SDK_VERSION for Support Library demos
...
Bug: 28302992
Change-Id: I456d407ba5442cd66571f307e02d5d26a4ee23aa
2016-04-21 10:27:11 -07:00
Christopher Ferris
751b792122
Merge "Fix up the makefiles and some samples." am: 2473cab
...
am: d0a7343
2016-04-20 22:34:44 +00:00
Christopher Ferris
0e2da18081
Fix up the makefiles and some samples.
...
Add LOCAL_DEX_PREOPT := false to force the samples to build actual apks.
In addition, fix a couple of other small issues:
- TtsEngine didn't have the api level set properly.
- SimpleJNI used a non-ndk library and was using libc++.
Change-Id: I1fd7c187956eed4620049bb746f4d62babcd648a
2016-04-19 14:32:13 -07:00
Chris Banes
91eee205f3
Make the SupportDemo apps work the AppCompat + VDC
...
Change-Id: Ib13152d2256081e4534b4b03bb1e376b8cc18f79
2015-12-18 10:45:04 +00:00
Mady Mellor
69bd278c0c
Add proguard configuration to support design demos sample app
...
Proguard was stripping out the coordinator layout behavior and the
linear layout manager classes.
Change-Id: Ibe72d5952bee20cf386e7384e261f46eea1cb67d
2015-09-09 10:42:59 -07:00
Chris Banes
2194f821f0
AppBarLayout demo
...
Change-Id: I0b4439c4658371db6c4a4cfe95f8e77cd7015891
2015-05-01 11:28:13 +01:00
Chris Banes
b859e355e5
Revert "Disable the design support library and demos"
...
This reverts commit 97930fc88b
2015-04-09 07:17:57 +00:00
Chris Banes
97930fc88b
Disable the design support library and demos
...
Change-Id: Ia0247179d3230d0ec2a198d458bc417fe3102d9d
2015-04-08 08:11:06 +01:00
Chris Banes
e1556d3dfc
Revert "Remove the redundant dependency on Support7Demos"
...
This reverts commit 12edcb5d03
2015-04-07 19:22:45 +00:00
Chris Banes
12edcb5d03
Remove the redundant dependency on Support7Demos
...
Change-Id: I5cf4e061547ad33caa71f802f7a36b36468d17bf
2015-04-07 19:17:46 +01:00
Chris Banes
f212598d83
Add new SupportDesignDemos sample app
...
- I've moved the design stuff from Support7Demos
Change-Id: Ibb62a1692550419fea25d297aca5c0c7da0b0dbd
2015-02-10 11:12:30 -08:00
