LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,761 Commits 2 Branches 0 Tags
9418bcd8cf160fd1623b97ba97a644cabbd24a7c
Commit Graph

10761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Stadler
3f733fd9d2 Classpath cleanup 
1. Remove camera & gallery2 pending http://b/issue?id=5584451
2. Remove Email until apache duplication in UnifiedEmail can be
    resolved.  http://b/issue?id=5932475
3. Added frameworks/support/v13/ics & frameworks/support/v13/ics-mr1

Change-Id: I71bc9adac98bf280e9498c68fada43215971a714
 2012-01-27 14:28:19 -08:00
Xavier Ducrohet
4f410903bb am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 12:02:44 -08:00
Xavier Ducrohet
54ee466c53 am d4f9372a: Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 
* commit 'd4f9372a4dc45bafb7c962046459cc22f18e5098':
  Move api.xml from tools/ to platform-tools/
 2012-01-27 12:02:42 -08:00
Xavier Ducrohet
d4f9372a4d Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 2012-01-27 12:00:38 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/ 
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
 2012-01-27 11:59:10 -08:00
Robert Ly
04ad17a96b am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit '5d1dd1c68f1cefd22a67736677ab19f3fddc0033':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 09:06:37 -08:00
Robert Ly
a0def2c375 am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit '5d1dd1c68f1cefd22a67736677ab19f3fddc0033':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 09:06:29 -08:00
Robert Ly
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08:00
Martin Storsjo
6dd4b91b32 Make sure __u64 is defined even for strict ansi or -std=c99 
The x86 asm headers define __u64 regardless of __STRICT_ANSI__.
The linux/videodev2.h header requires __u64 to be defined, thus
this fixes compiling with -std=c99 when including the
linux/videodev2.h header.

In glibc, the asm/types.h header defines __u64 regardless of
__STRICT_ANSI__.

This commit copies the updated header from bionic into the ndk
platform headers.
 2012-01-27 17:54:02 +02:00
Raphael Moll
1df367352a am 2b53ba58: Projects whitelisted for Windows SDK compilation. 
* commit '2b53ba58976db5696d65e95ce5c1968263976a71':
  Projects whitelisted for Windows SDK compilation.
 2012-01-26 16:05:00 -08:00
Raphael Moll
2b53ba5897 Projects whitelisted for Windows SDK compilation. 
This replaces the list maintained in build/core/main.mk
There's a similar change in sdk.git at Change Ifa8111dbae

Change-Id: Ie6f728bee2caea203865c4f861b657323f9f4c9c
 2012-01-26 15:27:13 -08:00
Jeff Brown
8e78aabf3a Organize imports to resolve ambiguous type errors. 
Fixes an ambiguous import involving OperationCanceledException.

Change-Id: Ie96b1225b44342eabb70e25ce6e43dc027b65489
 2012-01-26 12:38:18 -08:00
The Android Automerger
b36f23cca1 merge in jb-release history after reset to master 2012-01-25 15:50:18 -08:00
Nick Pelly
70e35a6b28 am a983c2a1: Update NFC samples. 
* commit 'a983c2a1a39cd4829594f19fd9d0d2070cd0cc71':
  Update NFC samples.
 2012-01-25 13:32:23 -08:00
Nick Pelly
a983c2a1a3 Update NFC samples. 
o Remove NFCDemo sample app. It's janky and is mostly parsing code
  that isn't needed anymore.
o Use new NDEF APIs for parsing and creating records
o Use nicer setNdefPushMessage() API
o Delete helper NDEF code that is not needed any more
o Use URL instead of Text for the foreground push demo
o Mark AndroidBeamDemo a test so it gets installed in data not system

Change-Id: I75eda84019c2075956688e26f2598f126d5659a2
 2012-01-25 13:16:52 -08:00
The Android Automerger
9c3b45bd1c merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:08:07 -08:00
Dianne Hackborn
689f95b1ab am 3c407385: am e03f7627: am 85241cc7: Add button to clear back stack. 
* commit '3c407385303dc44906342147368451f2ef528cff':
  Add button to clear back stack.
 2012-01-25 09:00:47 -08:00
Dianne Hackborn
3c40738530 am e03f7627: am 85241cc7: Add button to clear back stack. 
* commit 'e03f7627874b4f8c0bfa5c302f59a6d0cd83ee40':
  Add button to clear back stack.
 2012-01-25 08:57:43 -08:00
The Android Automerger
8f9d03a7c1 merge in ics-release history after reset to master 2012-01-25 06:59:28 -08:00
David 'Digit' Turner
0a41af2f72 am a9c4ae8d: Merge "ndk: Remove obsolete header and library files." 
* commit 'a9c4ae8d3a4cbfab84cf1814def159148692c6bb':
  ndk: Remove obsolete header and library files.
 2012-01-25 02:53:40 -08:00
David 'Digit' Turner
a9c4ae8d3a Merge "ndk: Remove obsolete header and library files." 2012-01-25 02:50:53 -08:00
David 'Digit' Turner
e42979c5cb ndk: Remove obsolete header and library files. 
Change-Id: I1d18b1364c1aa90aebdc068eade6aa68e43f6f2f
 2012-01-25 11:40:50 +01:00
Dianne Hackborn
ec672e3821 am 85241cc7: Add button to clear back stack. 
* commit '85241cc7950e60747decf21eab81a9c6b9a3e71b':
  Add button to clear back stack.
 2012-01-24 17:19:20 -08:00
Dianne Hackborn
e03f762787 am 85241cc7: Add button to clear back stack. 
* commit '85241cc7950e60747decf21eab81a9c6b9a3e71b':
  Add button to clear back stack.
 2012-01-24 17:19:03 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack. 
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
 2012-01-24 13:39:02 -08:00
The Android Automerger
ed0f12abc9 merge in ics-release history after reset to master 2012-01-24 06:59:28 -08:00
Svetoslav Ganov
4ce026b4b1 Updating the monkey to use a dedicated UI test bridge. 
1. The MonkeySourceNetworkViews was registering a raw event
   listener for accessibility events and hence perform
   connection and cache management in similar way to an
   AccessibilityService. This is fragile and requires
   the Monkey implementor to know internal framework
   stuff. Now the functionality required by the class
   is accessed via the new UiTestAutomationBridge.

Change-Id: Idd5820e42a4b4dfc1d9eed8977ec5ccd96485daa
 2012-01-23 18:23:45 -08:00
Robert Ly
74c1836184 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: Ic5f16194fc0d0314d9170a8598eccc17b6a4e26c
 2012-01-23 17:58:16 -08:00
Andy McFadden
dc1c5412e5 am fb4ffd37: Merge "Use Map.Entry, not LinkedHashMap.Entry" 
* commit 'fb4ffd37de2c4cdf0af962f960076dc7ba1c12ab':
  Use Map.Entry, not LinkedHashMap.Entry
 2012-01-23 09:36:00 -08:00
Andy McFadden
fb4ffd37de Merge "Use Map.Entry, not LinkedHashMap.Entry" 2012-01-23 09:34:38 -08:00
The Android Automerger
f8708200da merge in ics-release history after reset to master 2012-01-23 06:59:36 -08:00
Robert Ly
6804eb4b3e am 9dc9cff1: am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '9dc9cff102391ca7b2eb8b680554e7848f20e973':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 16:43:19 -08:00
The Android Open Source Project
a31a63e5c7 am 04b76422: am 3407aafe: Reconcile with ics-mr1-release 
* commit '04b764227c8bcdabdd7faf82bc905422204ff187':
 2012-01-20 16:43:18 -08:00
Robert Ly
0c196f9a77 am 993c70d3: am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '993c70d3fad09e6827017e87abfcb286c1a964d8':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 16:43:17 -08:00
Robert Ly
9dc9cff102 am b295c347: am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit 'b295c347f44b2390f44bdbaffdd1c37ab19cc2ff':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 16:38:03 -08:00
The Android Open Source Project
04b764227c am 3407aafe: Reconcile with ics-mr1-release 
* commit '3407aafede66786616436dff0c448a77746f60aa':
 2012-01-20 16:37:57 -08:00
Robert Ly
993c70d3fa am 85755fae: am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '85755fae3bda06e94e1d191c20c70e5344293b9a':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 16:37:56 -08:00
The Android Open Source Project
f25db23f45 am a91b32c1: am 113986be: Reconcile with ics-mr1-release 
* commit 'a91b32c1d71d8cac75917d35d6263e74916806f6':
 2012-01-20 15:54:41 -08:00
Dianne Hackborn
4497b29f6f am 37e103ca: am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample. 
* commit '37e103caf5f0264fb84fc25174661bf74c6c4715':
  Clean up and extend the linkify sample.
 2012-01-20 15:54:40 -08:00
The Android Open Source Project
a91b32c1d7 am 113986be: Reconcile with ics-mr1-release 
* commit '113986be4f8bc71da5d30520bb7095b70eeb72d5':
 2012-01-20 15:52:15 -08:00
Dianne Hackborn
37e103caf5 am 5370dc8f: am 2a9de021: Clean up and extend the linkify sample. 
* commit '5370dc8f0dc20a46302f823af38cb48d08de1c45':
  Clean up and extend the linkify sample.
 2012-01-20 15:52:04 -08:00
Andy McFadden
0da366d78a Use Map.Entry, not LinkedHashMap.Entry 
Map.Entry is the defined return value from entrySet().
LinkedHashMap.Entry shouldn't be used directly.

Change-Id: Ib23ceac365c85cdec6ab1688e8f8168ce882bc90
 2012-01-20 14:38:08 -08:00
Robert Ly
b295c347f4 am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '3d398d7243fece134e677480899437880a9259ed':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 11:13:33 -08:00
Robert Ly
ae5aac2939 am 3d398d72: Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
* commit '3d398d7243fece134e677480899437880a9259ed':
  Revert "updating the SampleSyncAdapter sample to add stream item and photo code"
 2012-01-20 11:13:31 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
This reverts commit 7a98345fc5
 2012-01-20 11:07:10 -08:00
The Android Open Source Project
3407aafede Reconcile with ics-mr1-release 
Change-Id: I125a7243c23acb8c9268fcdab4ad953df8532844
 2012-01-20 10:25:24 -08:00
Robert Ly
85755fae3b am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '7a98345fc5229a23b4490713991f78170374dd11':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 10:21:38 -08:00
Robert Ly
8b61858ba3 am 7a98345f: updating the SampleSyncAdapter sample to add stream item and photo code 
* commit '7a98345fc5229a23b4490713991f78170374dd11':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-20 10:20:37 -08:00
The Android Automerger
deda7c815c merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:01 -08:00
Robert Ly
7a98345fc5 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: I6d44ea3f912a3d1e52695bda785c81ff527160d5
 2012-01-19 14:51:23 -08:00