Alan Viverette
14fba07cf0
DO NOT MERGE Material theme
...
BUG: 15467097
Change-Id: Icea9710a8733a0c79c114a56faa61db99b9723bd
2014-06-06 13:52:28 -07:00
Raphael Moll
700c6fd81d
Android USB driver: support 4EE7 (Nexus adb only).
...
Bug: b/14988808
Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
2014-06-06 12:50:21 -07:00
Jesse Hall
319d36a9d1
am 6ed7e6df: am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit '6ed7e6dfcc36a41ddface0527d1e4a2c053cc736':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:37:08 +00:00
Jesse Hall
6ed7e6dfcc
am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit 'ea3858285b2876d241218f9319cc256972160c1c':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:32:44 +00:00
Jesse Hall
ea3858285b
am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
...
* commit '3d1f08375865a75ab6f67a45967cf9ad0c19ef72':
ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:16:57 +00:00
Jesse Hall
3d1f083758
Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
2014-06-06 16:13:37 +00:00
Jae Seo
ba490132c0
am 11d8830d: AtscInput: Update to the latest TV Input Framework API
...
* commit '11d8830d246e18e65072613ec86e1c0aaf4070df':
AtscInput: Update to the latest TV Input Framework API
2014-06-06 12:36:02 +00:00
Craig Stout
cfd0b3b2b7
am d55d61fd: Remove deprecated Params from BrowseAnimationFragment.
...
* commit 'd55d61fd166ef08c43d3d7f22080c52a98313621':
Remove deprecated Params from BrowseAnimationFragment.
2014-06-06 12:36:01 +00:00
Jesse Hall
3bcccf420f
ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
...
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.
Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
2014-06-05 21:28:16 -07:00
Jesse Hall
acda0020dd
ndk: Remove extra GLES symbols on 64-bit platforms
...
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
(cherry picked from commit 74439535fa71e38a19734406b69af63773997edc)
Change-Id: Id675df1a1e2c43d74fee672be33357ffd1723fd0
2014-06-05 21:28:00 -07:00
Jae Seo
11d8830d24
AtscInput: Update to the latest TV Input Framework API
...
- Commented out setAvailable() until a new design is proposed.
- Changed TvInputSessionImpl to Session.
- Renamed onSetVolume() to onSetStreamVolume().
Change-Id: I3137ca5514c65b24f35f5ab79e40fa08af0c354f
2014-06-06 10:55:18 +09:00
Jesse Hall
2433ffdef5
ndk: Remove extra GLES symbols on 64-bit platforms
...
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
Change-Id: Ib227d9d163bfe2859b13eb57dc19518d3a3f90d0
2014-06-05 18:36:32 -07:00
Craig Stout
84040d31c0
am 04e6d2d1: Remove use of deprecated Params.
...
* commit '04e6d2d1d94527a76b911dd718a45752707d2104':
Remove use of deprecated Params.
2014-06-05 00:06:56 +00:00
Raphael Moll
df72a54f9c
am adcf12ed: am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit 'adcf12ed0864d17937a358b18a609a611cfa8bf5':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 22:01:47 +00:00
Raphael Moll
adcf12ed08
am 4000df93: am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '4000df931bb1b0f9a9e37430212124a9c37e6972':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:58:54 +00:00
Raphael Moll
4000df931b
am 6ab8ef21: Merge "Move SDK system-image source.prop_templates in their own folder."
...
* commit '6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc':
Move SDK system-image source.prop_templates in their own folder.
2014-06-04 21:46:13 +00:00
Raphael Moll
6ab8ef21b8
Merge "Move SDK system-image source.prop_templates in their own folder."
2014-06-04 21:30:14 +00:00
Craig Stout
d55d61fd16
Remove deprecated Params from BrowseAnimationFragment.
...
Change-Id: Ia8d77eaea96b2586c8c617bbcca34fea4ee76e5d
2014-06-04 14:14:02 -07:00
Glenn Kasten
a16dfb7878
Update OpenSLES_Android.h for API 20
...
All other include/SLES/*.h are unchanged since API 14
Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-06-04 12:47:40 -07:00
Marco Nelissen
8db292b202
am 9cfe0a64: (-s ours) Merge "NDK files - do not merge" into lmp-preview-dev
...
* commit '9cfe0a64c5d4501d2663a584fdffc4fa7851db51':
NDK files - do not merge
2014-06-04 18:44:20 +00:00
Dake Gu
6b1715b5b6
am 7084b28f: Merge "SupportLeanbackDemo: example of add/remove items/rows" into lmp-preview-dev
...
* commit '7084b28f8d51c1b3e36fa006fd4c9cbb07c9337b':
SupportLeanbackDemo: example of add/remove items/rows
2014-06-04 18:43:32 +00:00
Steve Moyer
018aebe62f
am aed52549: (-s ours) am d87e9d35: (-s ours) am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'aed525497fa0ee031d647d1478a3843b8e675ebd':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:42:21 +00:00
Steve Moyer
767ec21303
am a0fc195e: (-s ours) am bbf18071: (-s ours) am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
* commit 'a0fc195e77d6d25f6e4be1a8e8d394913a041919':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-06-04 17:42:20 +00:00
Steve Moyer
aed525497f
am d87e9d35: (-s ours) am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'd87e9d353430779e00551eb394f5b9340099470a':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:29:04 +00:00
Steve Moyer
a0fc195e77
am bbf18071: (-s ours) am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
* commit 'bbf180719d3b1db093111bff1319cc647e904f5a':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-06-04 17:29:03 +00:00
Steve Moyer
d87e9d3534
am e561dd48: (-s ours) DO NOT MERGE: fix package for AndroidJUnitRunner
...
* commit 'e561dd484613737f0ee9289bab4be4361b3fab31':
DO NOT MERGE: fix package for AndroidJUnitRunner
2014-06-04 17:12:13 +00:00
Craig Stout
04e6d2d1d9
Remove use of deprecated Params.
...
Change-Id: I5883b6e7e8d0444bb010ed81c6b860f227634a57
2014-06-04 10:03:26 -07:00
Steve Moyer
bbf180719d
am 23a8adf2: (-s ours) DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
* commit '23a8adf276448f68efb049a2f2ef3409af59dd1c':
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-06-04 17:01:46 +00:00
Steve Moyer
e561dd4846
DO NOT MERGE: fix package for AndroidJUnitRunner
...
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-06-04 09:59:22 -07:00
Steve Moyer
23a8adf276
DO NOT MERGE: Add SmsTest and mege emulator smoke tests
...
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest
Conflicts:
build/sdk.atree
Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-06-04 09:55:31 -07:00
Yohei Yukawa
a42174b283
am 44c9365c: (-s ours) DO NOT MERGE Make sample IME aware of language switching
...
* commit '44c9365c5e239206b105391f0fb661126046c340':
DO NOT MERGE Make sample IME aware of language switching
2014-06-04 16:45:07 +00:00
Andrew Hsieh
f77a689ffd
64-bit mips64el-* multilib sysroot
...
Change-Id: I88fb4492d16eece4347589da75fe1ed2ed7d2254
2014-06-04 23:42:16 +08:00
Raphael Moll
32b5e338b5
am 95a5c56c: am 728f321c: Merge "Add Build-Tools runtime.properties file."
...
* commit '95a5c56c8f6d87bb9a3c4d08b94c13c409c6ea74':
Add Build-Tools runtime.properties file.
2014-06-04 12:28:41 +00:00
Raphael Moll
95a5c56c8f
am 728f321c: Merge "Add Build-Tools runtime.properties file."
...
* commit '728f321cb94220e1f7d1d72759b6c6b342152c15':
Add Build-Tools runtime.properties file.
2014-06-04 09:55:53 +00:00
Raphael Moll
728f321cb9
Merge "Add Build-Tools runtime.properties file."
2014-06-04 04:05:07 +00:00
Raphael Moll
26bcf6a511
Move SDK system-image source.prop_templates in their own folder.
...
This allows to have a different rule to generate the source.properties
based on the templates and place them in a directory that depends on
the current target CPU ABI. In turn this prevents the build from
mixing different source.props when building different targets.
Change-Id: I4a1d9f47426c94f376947ddae8be9f5549331616
2014-06-03 17:30:16 -07:00
Marco Nelissen
9cfe0a64c5
Merge "NDK files - do not merge" into lmp-preview-dev
2014-06-04 00:26:49 +00:00
Marco Nelissen
ddd6c1d56b
NDK files - do not merge
...
b/15414091
Change-Id: I939dc65f8e34cd19eb42b276ccee23d76f4b0ee7
2014-06-03 17:17:07 -07:00
Dake Gu
7084b28f8d
Merge "SupportLeanbackDemo: example of add/remove items/rows" into lmp-preview-dev
2014-06-03 23:09:10 +00:00
Raphael Moll
37433ac223
Add Build-Tools runtime.properties file.
...
Change-Id: I5addf44a2ea3dbb91df5a49f6fcb10e75047fa82
2014-06-03 13:46:51 -07:00
Craig Stout
a22f846a08
am 1c4c2f58: Merge "Use CardPresenter in VerticalGridFragment." into lmp-preview-dev
...
* commit '1c4c2f587267d947b1319a514446b52b2250321e':
Use CardPresenter in VerticalGridFragment.
2014-06-03 17:17:03 +00:00
Jae Seo
adb9d06c23
am c652a582: AtscInput: Use the new column name for generic data
...
* commit 'c652a582c8ce966f50c2c05693992386257748fc':
AtscInput: Use the new column name for generic data
2014-06-03 17:16:53 +00:00
Jae Seo
5cab8f304f
am f32b19ee: Merge "AtscTvInput: Use the new android.media.tv.* classes" into lmp-preview-dev
...
* commit 'f32b19ee31cfbbcfa6478cb5cf9be36ed5327f0d':
AtscTvInput: Use the new android.media.tv.* classes
2014-06-03 17:16:52 +00:00
Craig Stout
c96df19207
am c06fc007: Use a single card presenter instance so views get recycled.
...
* commit 'c06fc0073e253ece8bd402524604693d53f730ef':
Use a single card presenter instance so views get recycled.
2014-06-03 11:13:20 +00:00
Andrew Hsieh
d3b356b67d
am 172b2a28: am 80bc9315: Merge "Fix warning about undefined __LP64__"
...
* commit '172b2a282238548d90a0fb35190e3dd066d831fa':
Fix warning about undefined __LP64__
2014-06-03 11:11:35 +00:00
Andrew Hsieh
880ff4ab33
am be5b713a: am 7f4142f2: Merge "Refresh 64-bit headers/libs (WW22)"
...
* commit 'be5b713adfef26029b747d4a29ec1a5f54dd596a':
Refresh 64-bit headers/libs (WW22)
2014-06-03 11:11:25 +00:00
Andrew Hsieh
172b2a2822
am 80bc9315: Merge "Fix warning about undefined __LP64__"
...
* commit '80bc93153df481a2bb86bc2f384af681836f37a5':
Fix warning about undefined __LP64__
2014-06-03 07:51:33 +00:00
Andrew Hsieh
be5b713adf
am 7f4142f2: Merge "Refresh 64-bit headers/libs (WW22)"
...
* commit '7f4142f25e7f9510b0e3e484a0a3ae70cd03d567':
Refresh 64-bit headers/libs (WW22)
2014-06-03 07:46:56 +00:00
Andrew Hsieh
80bc93153d
Merge "Fix warning about undefined __LP64__"
2014-06-03 07:33:17 +00:00
Andrew Hsieh
7f4142f25e
Merge "Refresh 64-bit headers/libs (WW22)"
2014-06-03 07:25:05 +00:00