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

15285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raphael Moll
6e56697cb2 Merge "Ability to generate SDK system-images for arm64 and x86_64" 2014-05-28 01:56:17 +00:00
Yigit Boyar
b5de9c7b9d Added CardView demo to SupportV7 demo app 
Change-Id: Ie1b81426dc67c67766eb20fb8f1fc984d25a42cf
 2014-05-27 18:32:53 -07:00
Yigit Boyar
b4c3e94a12 am 67bdb44d: DO NOT MERGE Remove deprecated RecyclerView methods 
* commit '67bdb44d980e6f565f4ec3063a6041bbcbab397c':
  DO NOT MERGE Remove deprecated RecyclerView methods
 2014-05-28 01:32:00 +00:00
Yigit Boyar
67bdb44d98 DO NOT MERGE Remove deprecated RecyclerView methods 
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
 2014-05-28 01:18:25 +00:00
Ben Cheng
c4bbd0a628 am 5f7d9640: am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here." 
* commit '5f7d9640ae6fc01b058d5d3f09cf2bad21fb8c74':
  Move the panorama benchmark from packages/apps/Camera to here.
 2014-05-28 00:22:28 +00:00
Ben Cheng
5f7d9640ae am 960a770d: Merge "Move the panorama benchmark from packages/apps/Camera to here." 
* commit '960a770d6c27bd986b15e8cf7579d10d5ccb2b1d':
  Move the panorama benchmark from packages/apps/Camera to here.
 2014-05-28 00:18:20 +00:00
Ben Cheng
960a770d6c Merge "Move the panorama benchmark from packages/apps/Camera to here." 2014-05-28 00:15:35 +00:00
Ben Cheng
4b5b3887b9 Move the panorama benchmark from packages/apps/Camera to here. 
Also cut unnecessary dependencies on other parts of Android and build
staticly linked binaries so that the benchmark can be run on barebone
systems.

Change-Id: I69ea59c677c750d1982389dd62a6a74e4719d547
 2014-05-27 16:12:56 -07:00
Raphael Moll
4986fd4fdd Ability to generate SDK system-images for arm64 and x86_64 
(Cherry-picked from 40c7126e7c)

Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
 2014-05-27 16:10:14 -07:00
Marco Nelissen
46ef8b2a8b Media NDK files 
Change-Id: Ie41df1949abde194156ab188a662ec7065343d54
 2014-05-27 13:07:47 -07:00
Elliott Hughes
6f42309d3b am d7130107: am 95387dd1: am f570883a: Merge "Fix MIPS build." 
* commit 'd7130107ae53237c6b743195a7c6fbe63f106c01':
  Fix MIPS build.
 2014-05-23 21:42:15 +00:00
Ying Wang
ebd29c68a7 am c5aba030: am df3def70: am 8eaca3a3: Merge "Host multilib build." 
* commit 'c5aba03039b8d5ec798c8e6f1d3c44ee88e5c020':
  Host multilib build.
 2014-05-23 21:42:12 +00:00
Elliott Hughes
d7130107ae am 95387dd1: am f570883a: Merge "Fix MIPS build." 
* commit '95387dd16262fbd730eaafcdebdaeeb0a35ea33a':
  Fix MIPS build.
 2014-05-23 21:38:07 +00:00
Ying Wang
c5aba03039 am df3def70: am 8eaca3a3: Merge "Host multilib build." 
* commit 'df3def709410b63f8c6d41f0f3d1478d5903392e':
  Host multilib build.
 2014-05-23 21:38:06 +00:00
Elliott Hughes
95387dd162 am f570883a: Merge "Fix MIPS build." 
* commit 'f570883afaad1887da8c30fbfa51e70ffa6f268e':
  Fix MIPS build.
 2014-05-23 21:34:25 +00:00
Ying Wang
df3def7094 am 8eaca3a3: Merge "Host multilib build." 
* commit '8eaca3a30e184e235c0dcd0acabb9268a7bf25bf':
  Host multilib build.
 2014-05-23 21:34:23 +00:00
Elliott Hughes
f570883afa Merge "Fix MIPS build." 2014-05-23 21:31:18 +00:00
Ying Wang
8eaca3a30e Merge "Host multilib build." 2014-05-23 21:28:26 +00:00
Elliott Hughes
caebfa9b50 Fix MIPS build. 
We really ought to remove libportable.

Bug: 14903517
Change-Id: Id96b24bfe329096adffd94d452f440295d8aa83a
 2014-05-23 14:24:15 -07:00
The Android Automerger
d1a8309b44 am f61e5d37: merge in master-release history after reset to ec0df8cc31 
* commit 'f61e5d37f6cad98004a50d060cdab24caabb90f8':
  Fix win_sdk build.
  Merge "Fix gles3jni build with clang at android-11"
 2014-05-23 18:22:19 +00:00
Adrian Roos
dded89c1be Merge "Fix sample device admin" 2014-05-23 10:27:07 +00:00
Evan Charlton
08d98a2587 Merge "Add support for OSX to intellij-gen.sh" 2014-05-22 22:27:33 +00:00
Adrian Roos
212e67253b Fix sample device admin 
Changes to some checkboxes were only applied
after changing another checkbox / stopping and resuming the activity.

Change-Id: Idec3461e60786d97000402badcc3a66b1bf33a82
 2014-05-22 20:05:20 +00:00
Xavier Ducrohet
bf3db3de59 resolved conflicts for merge of c32cb704 to master 
Change-Id: Ib1c6dba900a25a52a28f09de0848fba55c873117
 2014-05-22 11:25:39 -07:00
Jeff Sharkey
20f2e640a6 Merge "Extend Vault with directory selection, renaming." 2014-05-22 17:35:52 +00:00
Xavier Ducrohet
c32cb7040f am f8a99a45: Reset version number to .0.0 for new API level SDK. 
* commit 'f8a99a451bfbdcf75bb2c835f17cc8471321cbe2':
  Reset version number to .0.0 for new API level SDK.
 2014-05-22 16:46:31 +00:00
Jeff Sharkey
7feee23faf Extend Vault with directory selection, renaming. 
Bug: 12350110
Change-Id: I41747fdffa79688163c32392ffbeb78320717f92
 2014-05-22 09:27:52 -07:00
Xavier Ducrohet
f8a99a451b Reset version number to .0.0 for new API level SDK. 
Change-Id: I0765de9dbb4f354c0b0a411b71bfcecb6797c632
 2014-05-22 09:27:02 -07:00
The Android Automerger
f61e5d37f6 merge in master-release history after reset to ec0df8cc31 2014-05-22 07:21:31 -07:00
The Android Automerger
324bad2b5f merge in master-release history after reset to 250b336c2b 2014-05-22 05:49:36 -07:00
Jerome Poichet
ec0df8cc31 Merge "Adding AUDIO_RECORD permission" 2014-05-22 07:03:03 +00:00
Jeff Sharkey
da58ea7469 Merge "Example code to test renaming documents." 2014-05-22 05:48:30 +00:00
Jeff Sharkey
5214072d6c Example code to test renaming documents. 
Bug: 12350110
Change-Id: I6be7bd1cd93b8c1c83f05496157534d879f2f223
 2014-05-21 22:25:18 -07:00
Jerome Poichet
0592982602 Adding AUDIO_RECORD permission 
Need AUDIO_RECORD permission to support audio in search

Change-Id: I65eb1180eeb7506d678d75e61eb9e5d01fc4bf41
 2014-05-21 22:27:44 +00:00
Jerome Poichet
250b336c2b Merge "Using new search fragment parameters" 2014-05-21 22:27:10 +00:00
Jerome Poichet
999a29a664 Using new search fragment parameters 
Change-Id: I4fc3994bed5b17b4c84e12881e1c095b040304de
 2014-05-21 15:16:48 -07:00
The Android Automerger
c0b475fdef merge in master-release history after reset to 6f2b614418 2014-05-21 05:49:32 -07:00
Ying Wang
3bc8fd9e50 Host multilib build. 
Bug: 13751317
Change-Id: I05ad98c1f3f55e3288fbcc169311a7685b872fd9
 2014-05-20 17:59:48 -07:00
Raphael Moll
6f2b614418 am f7863319: am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master 
* commit 'f786331925d50c2235f298e39880a9a05670b0dd':
  Fix SDK build.
 2014-05-21 00:01:29 +00:00
Raphael Moll
f786331925 am 261307be: resolved conflicts for merge of bf164835 to stage-aosp-master 
* commit '261307bebe8986599055bb97d5587977c8da53eb':
  Fix SDK build.
 2014-05-20 23:35:46 +00:00
Raphael Moll
261307bebe resolved conflicts for merge of bf164835 to stage-aosp-master 
Change-Id: I3c380b1ddae5e088985513398d7eb6274d8426eb
 2014-05-20 16:29:29 -07:00
Joe Fernandez
2f5c985113 Removing old, duplicate developer.android.com server configuration 
- Added MOVED-README.txt to redirect future updaters

Change-Id: I42d557559690804015ac7721beb75a0279ae9756
 2014-05-20 16:01:18 -07:00
Raphael Moll
bf164835e6 Merge "Fix SDK build." 2014-05-20 21:12:26 +00:00
Raphael Moll
e9a7920ca4 Fix SDK build. 
development's sdk.atree depends on the generated file
/sdk/files/sdk_files_NOTICE.txt which was accumulating
all the tools notices.

However this file isn't generated anymore.
This replaces it by a static file.

This is only good as a temporary measure to fix the build.
The proper fix is to recreate the SDK rule to generate the
combined NOTICE.txt and move it in development.git

Change-Id: I27e4f38e756b81b002d16dfac5ccaa54a4463786
 2014-05-20 14:10:47 -07:00
Raphael Moll
e657db091b Merge "Ability to generate SDK system-images for arm64 and x86_64" 2014-05-20 19:49:40 +00:00
Evan Charlton
ffa8245e66 Add support for OSX to intellij-gen.sh 
Remove the hardcoded "linux-x86" path, and add support for darwin-x86.

Change-Id: I4c5db4683a6e8aac7d894e64415142d2ca5954a2
 2014-05-20 10:55:54 -07:00
The Android Automerger
277b322ff3 merge in master-release history after reset to 9700e9824f 2014-05-20 05:49:29 -07:00
George Mount
6ccc20a0aa Update activity transition API. 
Change-Id: Ic9f2ead3a6841ae7c11e38098aaf26a2b6e613fd
 2014-05-19 16:26:25 -07:00
Raphael Moll
40c7126e7c Ability to generate SDK system-images for arm64 and x86_64 
Change-Id: I2715a668271ed88fcd0c8c97ac35d05fcdd34a06
 2014-05-19 10:25:09 -07:00
The Android Automerger
b2f3d2f99a merge in master-release history after reset to 9700e9824f 2014-05-19 05:49:25 -07:00