Commit Graph

4 Commits

Author SHA1 Message Date
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
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
Adam Powell
e331666e3e Move AppNavigation samples around
Move AppNavigation to SupportAppNavigation - this one uses the support
lib navigation helpers.

Add AppNavigation as an implementation of the same sample using the
framework features in JB.

Change-Id: I59e0f2e3e11ccccc277b177aee87bd88da8eb2c6
2012-04-05 18:03:24 -07:00