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

8457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Katie McCormick
f7f567df37 am e065fd62: Merge "Doc change: updated index page for HDP sample." into ics-mr1 
* commit 'e065fd6209926814df312623a2a8230518e738c0':
  Doc change: updated index page for HDP sample.
 2012-01-11 16:05:13 -08:00
Katie McCormick
e065fd6209 Merge "Doc change: updated index page for HDP sample." into ics-mr1 2012-01-11 16:02:50 -08:00
Jesse Hall
5bad48a65e EmuGL: handle NULL data in glBufferData 
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.

Bug: 5833436

Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
 2012-01-11 15:40:29 -08:00
Dianne Hackborn
2704b66b52 am 0b6b4f2d: Merge "Fix notification sample to follow current UI guidelines." into ics-mr1 
* commit '0b6b4f2d195f8224e19b66e5c266a7fd798f321d':
  Fix notification sample to follow current UI guidelines.
 2012-01-11 10:54:45 -08:00
Dianne Hackborn
0b6b4f2d19 Merge "Fix notification sample to follow current UI guidelines." into ics-mr1 2012-01-11 10:53:25 -08:00
Dianne Hackborn
174f61c0e9 Fix notification sample to follow current UI guidelines. 
Lots of clean up on the messaging notification sample to show the real
correct way to do things.  Also mark up a bunch of the sample for use
in the documentation.

Change-Id: I3a29a944c2971e142c33b29aff94b1ba0b40ae0e
 2012-01-10 15:53:32 -08:00
Jesse Hall
def31e890f am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
 2012-01-09 15:53:56 -08:00
Jesse Hall
c732d40825 am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
  EmuGL: fix GL view position in window on OS X
 2012-01-09 15:53:55 -08:00
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Jesse Hall
409c49c526 Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 2012-01-09 15:51:40 -08:00
Katie McCormick
f741c05f0c Doc change: updated index page for HDP sample. 
Change-Id: I06a6af5bdfac9a260ca053dd11030631e49c2509
 2012-01-06 12:45:32 -08:00
Roman Nurik
5d9d3865fb am 5621efe1: docs: Allow d.a.c. to serve .OGV 
* commit '5621efe11cda8a885adc335f48b4d0c25ceb6f32':
  docs: Allow d.a.c. to serve .OGV
 2012-01-05 16:39:09 -08:00
Roman Nurik
5621efe11c docs: Allow d.a.c. to serve .OGV 
This is necessary for HTML5 video in Firefox.

Change-Id: Ifcc39c338db64aa6c05418c1f3235bda62081f9b
 2012-01-05 16:32:03 -08:00
Jesse Hall
a592d9c043 EmuGL: misc small cleanups 
* Disable verbose debug spam.
* Add missing GL enum to utility function. The default case was
  returning the correct size, so this doesn't fix any bugs, just
  removes some logcat spam.
* Comment and whitespace corrections.

Change-Id: I83fb8644331ae1072d6a8dae9c041da92073089f
 2012-01-05 10:50:01 -08:00
Jesse Hall
a4fb8a60b1 EmuGL: fix GL view position in window on OS X 
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
 2012-01-04 15:03:39 -08:00
Roman Nurik
9454c5bc6e am 9fe60c34: Allow d.a.c to serve webm and mp4 
* commit '9fe60c34a49c0be4d5014fb0e056959b4683304e':
  Allow d.a.c to serve webm and mp4
 2012-01-02 11:25:43 -08:00
Roman Nurik
9fe60c34a4 Allow d.a.c to serve webm and mp4 
Change-Id: I8c127642ee8bbeb5eda2cae0aaf2d0e902492a7a
 2011-12-22 16:44:39 -08:00
Roman Nurik
d951bcf132 am 93d610d5: DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
* commit '93d610d59aa9cbbaa99f760542252f91698103eb':
  DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files
 2011-12-20 12:04:24 -08:00
Roman Nurik
93d610d59a DO NOT MERGE Cherrypick from master: Allow d.a.c. to serve SVG files 
Change-Id: I6d13b21bdafa70ea19d14a95b65476ba7c037d8c
 2011-12-20 11:12:35 -08:00
Xavier Ducrohet
6967183115 am dc6a269f: Merge commit \'71c1d3d8\' into MR1 using -s ours 
* commit 'dc6a269f821073fc4bb4cf0f463e09ef15619fd3':
  Move platform component to rev3. do not merge.
 2011-12-15 15:55:10 -08:00
Xavier Ducrohet
dc6a269f82 Merge commit '71c1d3d8' into MR1 using -s ours 
Change-Id: I392ab7665f40f9c273f8d0f837597f1bd6c9d135
 2011-12-15 15:52:09 -08:00
Xavier Ducrohet
71c1d3d864 Move platform component to rev3. do not merge. 
Change-Id: I21157462faf12322112244d13390592e24529748
 2011-12-15 14:53:40 -08:00
Xavier Ducrohet
1793cd5a36 am c3a76886: am 2d954623: Fix WXGA720 skin to be portrait by default. do not merge. 
* commit 'c3a7688651789c53bc468dade39604a386ac364f':
  Fix WXGA720 skin to be portrait by default. do not merge.
 2011-12-15 14:42:43 -08:00