Raphael Moll
5ea71acfdd
am e9555599: am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."
...
* commit 'e9555599da16c3e40d0d359f6e46fedfc1f03b1d':
Fix SDK repo to prevent mixing different targets.
2014-06-03 03:00:47 +00:00
Raphael Moll
e9555599da
am 087ccb01: Merge "Fix SDK repo to prevent mixing different targets."
...
* commit '087ccb01527d9d7e8981751639c65b1eb6369534':
Fix SDK repo to prevent mixing different targets.
2014-06-03 02:56:09 +00:00
Yohei Yukawa
44c9365c5e
DO NOT MERGE Make sample IME aware of language switching
...
This CL demonstrates how the new language switching functionality
should work by using the SoftKeyboard sample.
BUG: 15267645
Change-Id: I18ab25a0784979fe6028b97a22ff02bfd502d506
(cherry picked from commit 88838a30af )
2014-06-03 01:36:34 +00:00
Raphael Moll
087ccb0152
Merge "Fix SDK repo to prevent mixing different targets."
2014-06-03 01:27:03 +00:00
Yohei Yukawa
62d389034f
Merge "Make sample IME aware of language switching"
2014-06-03 00:59:31 +00:00
Craig Stout
1c4c2f5872
Merge "Use CardPresenter in VerticalGridFragment." into lmp-preview-dev
2014-06-03 00:58:50 +00:00
Raphael Moll
4df9f469f7
Fix SDK repo to prevent mixing different targets.
...
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.
Also fix a warning when generating the repo.xml files.
Change-Id: I645ad13936b83c5c33bd84c046b60b77488b9113
2014-06-02 17:11:45 -07:00
Jae Seo
c652a582c8
AtscInput: Use the new column name for generic data
...
Change-Id: I4c144d96804d43b58fef2c223a30813eb05c50c6
2014-06-02 16:37:20 -07:00
Craig Stout
534619712a
Use CardPresenter in VerticalGridFragment.
...
Change-Id: I7e9fae64316e92b462f6117e73ba79aeb3d83d37
2014-06-02 16:22:44 -07:00
Jae Seo
f32b19ee31
Merge "AtscTvInput: Use the new android.media.tv.* classes" into lmp-preview-dev
2014-06-02 21:04:07 +00:00
Marco Nelissen
250139f533
Merge "NDK media codec sample"
2014-06-02 16:38:28 +00:00
Andrew Hsieh
818d75e32c
am 097f3d62: am 37f7e742: am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
...
* commit '097f3d628a4b391fcf46cd863a2e1367ef07431b':
Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 11:45:05 +00:00
Andrew Hsieh
097f3d628a
am 37f7e742: am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
...
* commit '37f7e7421f349513de5f6ee06f402a09b9783bf3':
Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 11:39:09 +00:00
Andrew Hsieh
37f7e7421f
am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
...
* commit 'e7a46c48417ff67390d80d6df457742b30430857':
Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 07:09:38 +00:00
Andrew Hsieh
e7a46c4841
Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
2014-06-02 07:06:48 +00:00
Andrew Hsieh
e85f942ec6
Fix warning about undefined __LP64__
...
See b.android.com/69975
Change-Id: If7f2b6fa29c36221b1a0d31a334cb34cecb4e8bc
2014-06-02 14:44:19 +08:00
Yohei Yukawa
88838a30af
Make sample IME aware of language switching
...
This CL demonstrates how the new language switching functionality
should work by using the SoftKeyboard sample.
BUG: 15267645
Change-Id: I18ab25a0784979fe6028b97a22ff02bfd502d506
2014-06-02 13:00:33 +09:00
Craig Stout
c06fc0073e
Use a single card presenter instance so views get recycled.
...
Change-Id: Id9d5dee2de506671e800b5d3a4fb011d3e64da44
2014-06-01 18:20:52 -07:00
Pavel Chupin
2e807e16dc
Add lib symlink to x86_64 so that 32-bit static libs are available
...
When multilib toolchain in NDK is used in -m32 mode we need 32-bit static libs
available for static compilation.
Change-Id: Ie7b5659f05338565fd19550ae4368934422e8b86
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com >
2014-06-01 18:52:16 +04:00
Jae Seo
d0fadf8726
AtscTvInput: Use the new android.media.tv.* classes
...
Also replaced the selections from some database operations with the new
buildXXX() helper methods since they are now not allowed.
Change-Id: I5cf4e9d219c6437ab751b1a9148e1e7792cdfec2
2014-05-31 13:58:32 -07:00
Chris Banes
d832efc6c1
Merge "Add android-support-v7-palette to build"
2014-05-31 08:06:34 +00:00
Dake Gu
901874c40c
SupportLeanbackDemo: example of add/remove items/rows
...
Change-Id: I3f74f7d768c8e61ae81a23e5515dec19b82d6289
2014-05-30 16:37:28 -07:00
Deepanshu Gupta
ef43acc413
Package renamed fonts.
...
PS names of fonts are renamed to include the version number. This change
packages the fonts from the output directory of the script that modifies
the fonts.
Change-Id: Iac2a34475b095ed38f8706420acda40c5d53364b
2014-05-30 10:38:45 -07:00
Ben Cheng
8683a8e389
am f8ca5a9e: am dc898c78: am 550e4425: Merge "Build both 64- and 32-bit versions."
...
* commit 'f8ca5a9e22e91e06a3715916189079df33a01ae8':
Build both 64- and 32-bit versions.
2014-05-30 17:12:16 +00:00
Ben Cheng
f8ca5a9e22
am dc898c78: am 550e4425: Merge "Build both 64- and 32-bit versions."
...
* commit 'dc898c7838c98dee558aace12c11553ebff2efc7':
Build both 64- and 32-bit versions.
2014-05-30 17:07:49 +00:00
Ben Cheng
dc898c7838
am 550e4425: Merge "Build both 64- and 32-bit versions."
...
* commit '550e44253f2eb23b909c80c9a9717c2cc36b4b8b':
Build both 64- and 32-bit versions.
2014-05-30 17:04:47 +00:00
Ben Cheng
550e44253f
Merge "Build both 64- and 32-bit versions."
2014-05-30 17:00:01 +00:00
Ben Cheng
c54a9369f0
Build both 64- and 32-bit versions.
...
Change-Id: I9e641cebcd71cb680ecb326e8c75e68e7d016ea4
2014-05-30 09:58:47 -07:00
Andrew Hsieh
727ac63f0a
Refresh 64-bit headers/libs (WW22)
...
Change-Id: Ic49750508a4c825e6ac222d8cd417e71dae53cbd
2014-05-30 23:21:02 +08:00
Narayan Kamath
01347d965e
am 361fce55: am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
...
* commit '361fce55866e220380fdf1c81f29e5498b5fa0a7':
Track changes to IActivityManager.startInstrumentation.
2014-05-30 11:50:55 +00:00
Narayan Kamath
361fce5586
am d9fb901d: am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
...
* commit 'd9fb901dc65e6780db5aad1c3bdb53a93dfd371b':
Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:44:18 +00:00
Narayan Kamath
d9fb901dc6
am 479cf9ff: Merge "Track changes to IActivityManager.startInstrumentation."
...
* commit '479cf9ff668f04fcc4deb24b115ef766f5115373':
Track changes to IActivityManager.startInstrumentation.
2014-05-30 10:37:50 +00:00
Narayan Kamath
479cf9ff66
Merge "Track changes to IActivityManager.startInstrumentation."
2014-05-30 10:35:30 +00:00
Narayan Kamath
fc9e3f6878
Track changes to IActivityManager.startInstrumentation.
...
Change-Id: Iceaecb720c2824134a1d6d13b1f3e0a16d41d76d
2014-05-30 11:33:02 +01:00
Chris Banes
8028b39252
Add android-support-v7-palette to build
...
Change-Id: I22cec92b976645d766441b140a5d5754c4ebbe46
2014-05-30 10:17:46 +00:00
Yigit Boyar
9c4a7ebc66
am 1d667358: Remove deprecated RecyclerView methods
...
* commit '1d6673588c5bb9a54a7439ebae1bd38e34979797':
Remove deprecated RecyclerView methods
2014-05-29 21:19:37 +00:00
Andrew Hsieh
acdb9ff78d
am aec2c2dd: am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
...
* commit 'aec2c2ddc9bdc28bd03e2656afce0b469168f0e1':
Refresh 64-bit headers/libs (WW21)
2014-05-29 21:09:36 +00:00
Marco Nelissen
8cc9aa8f32
NDK media codec sample
...
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
2014-05-29 13:12:56 -07:00
Andrew Hsieh
aec2c2ddc9
am ad3e8475: am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
...
* commit 'ad3e847512a3f28bc24f2418a97dbb3108c51559':
Refresh 64-bit headers/libs (WW21)
2014-05-29 19:15:28 +00:00
Andrew Hsieh
ad3e847512
am 844bc1d3: Merge "Refresh 64-bit headers/libs (WW21)"
...
* commit '844bc1d331a8714fbc54492ed119e0db86555d36':
Refresh 64-bit headers/libs (WW21)
2014-05-29 19:12:25 +00:00
Andrew Hsieh
844bc1d331
Merge "Refresh 64-bit headers/libs (WW21)"
2014-05-29 19:09:37 +00:00
Yigit Boyar
1d6673588c
Remove deprecated RecyclerView methods
...
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
(cherry picked from commit 67bdb44d98 )
2014-05-29 17:53:37 +00:00
Marco Nelissen
d33652a386
getSampletime -> getSampleTime
...
Change-Id: I089adb8a4050fe72befe272318a903ef93744335
2014-05-29 08:09:16 -07:00
Raphael Moll
cc3aa924e9
am 267ddd50: am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
...
* commit '267ddd50d75c86410ace6537ad3315b1eaaf730b':
Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 18:01:46 +00:00
Yigit Boyar
bc7b3e0342
am b4c3e94a: (-s ours) am 67bdb44d: DO NOT MERGE Remove deprecated RecyclerView methods
...
* commit 'b4c3e94a123fa669d45fb9e80f5a0e32ba6968e6':
DO NOT MERGE Remove deprecated RecyclerView methods
2014-05-28 18:01:41 +00:00
Ben Cheng
f7c5c4167e
am c4bbd0a6: am 5f7d9640: am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here."
...
* commit 'c4bbd0a628ae4cc16051ee7e7e8aca9e8a97cc9b':
Move the panorama benchmark from packages/apps/Camera to here.
2014-05-28 17:44:15 +00:00
Yigit Boyar
cbb1906438
am b5de9c7b: Added CardView demo to SupportV7 demo app
...
* commit 'b5de9c7b9d17d90396ec52cb32999698a945b28f':
Added CardView demo to SupportV7 demo app
2014-05-28 17:22:17 +00:00
Andrew Hsieh
19f647e8a7
Refresh 64-bit headers/libs (WW21)
...
Change-Id: I013af3ae4adac17d7b2ef5680d41d75dc9799d19
2014-05-28 21:07:45 +08:00
Raphael Moll
267ddd50d7
am 937cfb42: am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
...
* commit '937cfb42602c081143e1854ba5f67e18b2f97b46':
Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:59:48 +00:00
Raphael Moll
937cfb4260
am 6e56697c: Merge "Ability to generate SDK system-images for arm64 and x86_64"
...
* commit '6e56697cb229cd8c163583a03259a6787f60a84a':
Ability to generate SDK system-images for arm64 and x86_64
2014-05-28 01:57:55 +00:00