LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,313 Commits 2 Branches 0 Tags
ec2f91f54c254edbe0abe8b91beee6aefbffaa2f
Commit Graph

15313 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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