ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,216 Commits 2 Branches 0 Tags 54 MiB
f98f1364f8
Commit Graph

32216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
f98f1364f8 Merge "Refactor how timeouts are calculated." 2011-03-17 20:16:42 -07:00
Dianne Hackborn
e5e02aac29 am daa71254: am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'daa71254f3e3261ecc0e143955c89ced70bbf008':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:07:17 -07:00
Dianne Hackborn
5d1e292b88 am efb56934: am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit 'efb56934efdc0aae38ce7264f2576326293846b6':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:05:08 -07:00
Dianne Hackborn
1828fd2a08 am 1d50ad79: Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 
* commit '1d50ad7914de36b63a04d39bdc4791c1dadc7eae':
  Whoops, forgot the HONEYCOMB_MR1 constant. :(
 2011-03-17 19:02:15 -07:00
Dianne Hackborn
f9a31086ee Merge "AsyncTask now uses the poll executor for apps up through HC MR1 and the serialized one after that." 2011-03-17 19:02:11 -07:00
Dianne Hackborn
acf8cb2596 Merge "Whoops, forgot the HONEYCOMB_MR1 constant. :(" into honeycomb-mr1 2011-03-17 19:00:56 -07:00
Huahui Wu
381e05df74 am f5cf85d0: am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'f5cf85d07c99ae834d1b58bf5109982f9a4f3604':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:47:21 -07:00
Jason Sams
a1dc4b24a8 Merge "Migrate thread launch to driver." 2011-03-17 18:20:09 -07:00
Jason Sams
1d76718196 Merge "Start seperating out RS compute implementation. Create hal layer to seperate from runtime." 2011-03-17 18:19:56 -07:00
Huahui Wu
f495884211 am d1e89c41: am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'd1e89c412ff10345cd217ae3d1bb1e780d56dbaa':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:13:16 -07:00
Huahui Wu
1b3437371d am b1c43c32: Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 
* commit 'b1c43c32f518240fd75963ffc8e82cb13e036390':
  b/4116658 Fix the jumpy scrolling with some flash site.
 2011-03-17 18:11:04 -07:00
Huahui Wu
f6fb4ed1dc Merge "b/4116658 Fix the jumpy scrolling with some flash site." into honeycomb-mr1 2011-03-17 18:09:33 -07:00
Wink Saville
43e8369b56 am d2cc7d55: am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1 
* commit 'd2cc7d5543bf39e9caa444efc44e74d5ae2188a5':
  Change stopship to todo.
 2011-03-17 18:07:22 -07:00
Justin Ho
4959d3b06a am 93b1a4dd: am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '93b1a4dd97574da7de2f6c589d5c84f91829cd9a':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 18:06:55 -07:00
James Dong
02cc7170a2 am 14438b81: am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit '14438b81a1fe4d7ebdf8977f3d80a1dd1867c5ad':
  Fix missing AOSP copyright headers for more files
 2011-03-17 18:06:51 -07:00
Wink Saville
e0f42f3fe9 am 94191d43: am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1 
* commit '94191d43491a38305ca17456a9b806e58fbda99d':
  Change stopship to todo.
 2011-03-17 18:03:53 -07:00
Wink Saville
c57bb62954 am 651f38d7: Merge "Change stopship to todo." into honeycomb-mr1 
* commit '651f38d71788d6b1d50cb6c9810ba31f903407d9':
  Change stopship to todo.
 2011-03-17 18:00:55 -07:00
Justin Ho
b083a15e62 am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit 'dd8f9268415de539b9b17a9b7d24405b50d9c053':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 18:00:23 -07:00
James Dong
4164973cf1 am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
  Fix missing AOSP copyright headers for more files
 2011-03-17 18:00:19 -07:00
Wink Saville
b77b4807d0 Merge "Change stopship to todo." into honeycomb-mr1 2011-03-17 17:58:06 -07:00
Justin Ho
8ca8908e0f am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 17:55:58 -07:00
James Dong
0db849a855 am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
  Fix missing AOSP copyright headers for more files
 2011-03-17 17:55:48 -07:00
Eric Fischer
de06b0e350 Merge "Import revised translations." 2011-03-17 17:32:50 -07:00
Jeff Brown
c0a5e8df03 Refactor how timeouts are calculated. 
Added a timeout mechanism to EventHub and InputReader so that
InputMappers can request timeouts to perform delayed processing of
input when needed.

Change-Id: Iec2045baaf4e67690b15eef3c09a58d5cac76897
 2011-03-17 17:29:09 -07:00
Justin Ho
c14e692d62 Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 2011-03-17 16:49:32 -07:00
Xia Wang
cb22be3ba8 am 74f1b609: (-s ours) am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit '74f1b609510c942b2e56b045a6685f5a6d53ccce':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:27:45 -07:00
Xavier Ducrohet
23d088139d am 68957a0d: (-s ours) am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit '68957a0d7516c82b8cb4050f15294c663bf08338':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:27:42 -07:00
Mike Lockwood
158b7f0fba am f63113d1: am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit 'f63113d158b2afd98b41735ec02c8e800a73d23e':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:27:39 -07:00
Simon Wilson
430e80091e am 0620ebd7: (-s ours) am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '0620ebd7c47d79e95ed1048abd4317aa136bc0dd':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:27:36 -07:00
Mike Lockwood
66d5425cd4 am f309453b: (-s ours) am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'f309453bb85ec278f0206baef898461f5b0a8874':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:27:32 -07:00
Xia Wang
08b5f02649 am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit '01a111486d06c21ddb723195c177c8991d5db151':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:25:09 -07:00
Xavier Ducrohet
72551f34af am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:25:07 -07:00
Mike Lockwood
5f9fd46d00 am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit 'a5b68f39e2936a83eac0b995992724cd5de6905d':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:25:01 -07:00
Simon Wilson
f819b0bc4c am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3fa3721e8f771a6edc8acdd21f567af93ddea7e1':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:24:58 -07:00
Mike Lockwood
9f22e65f80 am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'af64e751e2373790dd661be80b11a03332712e90':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:24:53 -07:00
Xia Wang
601cf70eb9 am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:21:28 -07:00
Xavier Ducrohet
c8f07bae1f am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:21:20 -07:00
Mike Lockwood
6dd337b9f1 am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:20:56 -07:00
Simon Wilson
41c48eef34 am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:20:46 -07:00
Mike Lockwood
2ce416b5d2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
James Dong
29c6574d45 Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 2011-03-17 16:11:13 -07:00
Eino-Ville Talvala
edc5ac145b Merge "Add support for timestamps into SurfaceTexture." 2011-03-17 15:52:34 -07:00
Alex Sakhartchouk
17628cec4d Merge "Fixing a small bug in debug output Default font wasn't reset for debug output but used the last font instead." 2011-03-17 15:51:38 -07:00
Gloria Wang
c58f27ab1e Merge "Fix for bug 4126103. mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8&" 2011-03-17 15:23:06 -07:00
Xia Wang
0d2b3fe91d Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
James Dong
5f7204cb66 Fix missing AOSP copyright headers for more files 
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
  because these two files were moved from other places to the current location,
  and were actually created in 2010.

bug - 4119349

Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
 2011-03-17 14:43:12 -07:00
David Li
5a0d29009c Merge "GLES2Debugger: Make command exchange async to improve performance." 2011-03-17 14:38:37 -07:00
Teng-Hui Zhu
87d31b417b am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '6b3c25c859ef72e7f65527c6aae68e77df580b94':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:25:47 -07:00
Teng-Hui Zhu
3bc0feb989 am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:23:38 -07:00
Teng-Hui Zhu
3e8fac41f4 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:22:26 -07:00