LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,621 Commits 2 Branches 0 Tags
80df85f0c10b5e61b88b599e2840a7084d84d10c
Commit Graph

8621 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
656efe66fb am a0def2c3: am 5d1dd1c6: Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 
* commit 'a0def2c375bc73f9815cabf55eceead652922b0e':
  updating the SampleSyncAdapter sample to add stream item and photo code
 2012-01-27 21:09:09 -08:00
Trevor Johns
662b8f1c9a Adding manual redirect support to developer.android.com. 
Internal bug: 2347145

Change-Id: I0cdcec8a23704ab80878e8cc781b735fd2173011
 2012-01-27 20:16:15 -08:00
Trevor Johns
e52271aff9 Generate a valid main.py for use with developer.android.com. 
This fixes bugs in divide_and_compress_constants.py that caused a corrupt
main.py file to be generated for developer.android.com. Specifically,
extra quotes are no longer added, __main__ is now in quotes, and
webapp.WSGIApplication() parameters are now correct.

Also moved the call to memcache_zipserve.create_handler() to a seperate
line for readability.

Change-Id: I8906c54e70b2889389a95b92d4fbcf05a6c3e22d
 2012-01-27 20:08:25 -08:00
Jeff Brown
e250d46cc4 Merge "Organize imports to resolve ambiguous type errors." 2012-01-27 17:37:12 -08:00
Marco Nelissen
936e648ce9 Fix findunusedresources to handle package name different from path 
Change-Id: Ia010d0f71e3e7141f762fc83ff34d3426bac85a0
 2012-01-27 16:07:59 -08:00
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
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
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
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
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
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
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
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
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
fb4ffd37de Merge "Use Map.Entry, not LinkedHashMap.Entry" 2012-01-23 09:34:38 -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
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
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
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
The Android Open Source Project
113986be4f Reconcile with ics-mr1-release 
Change-Id: I169da9f82d60659a6a8a4969571e46c65a12e23d
 2012-01-19 13:06:34 -08:00
Dianne Hackborn
5370dc8f0d am 2a9de021: Clean up and extend the linkify sample. 
* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
  Clean up and extend the linkify sample.
 2012-01-19 10:12:54 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample. 
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
 2012-01-13 14:00:01 -08:00
Fred Quintana
9ce19670b2 Merge "fix the layout oddness that occurrs in portrait mode" 2012-01-12 18:07:07 -08:00
Fred Quintana
70c13b1957 fix the layout oddness that occurrs in portrait mode 
Change-Id: I42bb7479671c99220215cfc63d56d926baece10f
 2012-01-12 16:57:38 -08:00
The Android Automerger
c9011c7f3c merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:00:47 -08:00
The Android Open Source Project
771d0f06fa am 88f46420: Reconcile with ics-mr1-release 
* commit '88f4642092e394631ea6e749130fc09286265970':
 2012-01-12 08:58:05 -08:00
The Android Open Source Project
88f4642092 Reconcile with ics-mr1-release 
Change-Id: I881c64731cf66f630d0062e8b1f87bc9c3dfb5a9
 2012-01-12 08:56:08 -08:00
Jesse Hall
900f5e8793 am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:13:42 -08:00
Jesse Hall
9b19d582d9 am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:12:09 -08:00
Xavier Ducrohet
c784588597 am 3393b3ae: (-s ours) am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 
* commit '3393b3ae2b550bc47dc267e5f365f8a34c274da3':
  Move platform 15 sdk rev to 2. do not merge.
 2012-01-11 17:11:59 -08:00
Jesse Hall
4f66a14d53 Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 2012-01-11 17:10:35 -08:00
Xavier Ducrohet
3393b3ae2b am a318515c: Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 
* commit 'a318515c0d160122313a8e87d9002d957e8789b6':
  Move platform 15 sdk rev to 2. do not merge.
 2012-01-11 17:10:27 -08:00
Xavier Ducrohet
a318515c0d Merge "Move platform 15 sdk rev to 2. do not merge." into ics-mr1 2012-01-11 17:08:47 -08:00
Xavier Ducrohet
e4627619b3 Move platform 15 sdk rev to 2. do not merge. 
Change-Id: I8c3ab6cce4305afcd380b23ed0638169676d5d97
 2012-01-11 17:08:18 -08:00