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

8480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
c96cb33fbf am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
 2012-02-16 09:55:56 -08:00
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE. 
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
 2012-02-15 18:32:11 -08:00
Adam Powell
86200cff4e am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:21 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Scott Main
bfae3e810e am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
  docs: fix minsdkversion for native activity sample
 2012-02-09 12:16:47 -08:00
Scott Main
de797a2fb2 Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3 docs: fix minsdkversion for native activity sample 
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
 2012-02-09 12:10:27 -08:00
Adam Powell
247df4fe79 Add AppNavigation demo 
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
 2012-02-07 15:02:57 -08:00
Jesse Hall
3a62067e82 am 0e981c83: EmuGL: Fix heap corruption 
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
 2012-02-06 13:36:20 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption 
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
 2012-02-03 22:54:24 -08:00
Trevor Johns
dee8ce93f1 am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:10:28 -08:00
Trevor Johns
3b6ffd8112 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:10:27 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect 
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
 2012-02-03 12:32:10 -08:00
Xavier Ducrohet
8d346b22e7 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:47:17 -08:00
Xavier Ducrohet
df458cb832 Fix api version file with proper data enum. 
The generator tool was broken during the generics fix.

Change-Id: I7e375000ac52fba27af7992ffebb5858baf20b3a
 2012-01-31 19:18:06 -08:00
Xavier Ducrohet
5290d8b0ae am e11b2d6c: Update api version file with stripped generics info. 
* commit 'e11b2d6c9f479528092a56bfe94054798e3e4831':
  Update api version file with stripped generics info.
 2012-01-31 15:49:23 -08:00
Xavier Ducrohet
e11b2d6c9f Update api version file with stripped generics info. 
Change-Id: Iac38c14115757cbfa75808ce5e476912da80543d
 2012-01-31 15:44:27 -08:00
Dianne Hackborn
0a9b05000a am 97d0a1db: Merge "Fix bug in the new notification sample." into ics-mr1 
* commit '97d0a1db24c5c46089e5fa6c18b0fb1a49140125':
  Fix bug in the new notification sample.
 2012-01-30 12:56:13 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00
Dianne Hackborn
376e000436 Fix bug in the new notification sample. 
Change-Id: I021c5f374857d1affdddd8be37c0f441aaf14c95
 2012-01-30 11:44:05 -08:00
Yu Shan Emily Lau
df18044eb0 am 979806b0: Regular monkey should not write script log. 
* commit '979806b0a8998654f0b491478360782c0df49498':
  Regular monkey should not write script log.
 2012-01-30 11:26:48 -08:00
Yu Shan Emily Lau
979806b0a8 Regular monkey should not write script log. 
Change-Id: I225cb01d3fb81478ea0e13cc4a6546d71d16d251
 2012-01-30 11:08:53 -08:00
Trevor Johns
64a33beea2 am e12dad21: Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 
* commit 'e12dad21f0733c3dad7dc099fc896af86e54f90e':
  Generate a valid main.py for use with developer.android.com.
 2012-01-30 10:28:33 -08:00
Trevor Johns
e12dad21f0 Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 2012-01-30 10:27:05 -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
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
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
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08: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
85241cc795 Add button to clear back stack. 
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
 2012-01-24 13:39:02 -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
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
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
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
Dianne Hackborn
517329c2e9 am 2a9de021: Clean up and extend the linkify sample. 
* commit '2a9de0211d7f8c5cb6f4dfb3d0eb5baddb355f2f':
  Clean up and extend the linkify sample.
 2012-01-19 10:12:50 -08:00
Brett Chabot
fb11862390 Merge "Increase default runtest -j to 16." into ics-aah 2012-01-17 16:25:52 -08:00
Brett Chabot
12db436d22 Increase default runtest -j to 16. 
Change-Id: I4f98a630a7ad75557e462a122b83dd3c36cf6ab6
 2012-01-17 16:04:53 -08:00
Brett Chabot
a39865a1cb Update create_test to new android_mk API. 
Change-Id: I5b95cbee02051e3e347e68f874863a7b56e2df8b
 2012-01-17 15:54:39 -08:00
Dianne Hackborn
2a9de0211d Clean up and extend the linkify sample. 
Change-Id: If9d0451af3bfcdcd8bafb325f4b7978857efab7e
 2012-01-13 14:00:01 -08:00
Jesse Hall
7eef71a24c 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:14 -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
71c175fccd 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:29 -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