ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
30,731 Commits 2 Branches 0 Tags 54 MiB
bfdabe59f2
Commit Graph

30731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
bfdabe59f2 Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink" 2011-02-24 12:37:02 -08:00
Cary Clark
72c5f74ddb Merge "center long press to account for sloppy nodes" 2011-02-24 12:19:09 -08:00
Eric Fischer
fc9d6d7d6c am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '86409c8cb789cd7f672ee6de43e6bf1a337847db':
  Import revised translations.  DO NOT MERGE
 2011-02-24 11:24:39 -08:00
Leon Scroggins
f2d330c789 Merge "Stop the blinking caret when moving to another field." 2011-02-24 11:21:41 -08:00
Eric Fischer
adc551c073 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
 2011-02-24 11:18:56 -08:00
Eric Fischer
78948e6830 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Patrick Dubroy
c3b6278edc Merge "Fix 3272590: Long-press on home & menu should be same as click" 2011-02-24 10:55:44 -08:00
Wink Saville
a7237c6e61 am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only. 
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
  Do not start RILReceiver if wifi-only.
 2011-02-24 10:52:53 -08:00
Wink Saville
2b5819058c am 0dc8618d: Do not start RILReceiver if wifi-only. 
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
 2011-02-24 10:50:31 -08:00
repo sync
9912896482 am 3905bc6c: (-s ours) am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
* commit '3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
 2011-02-24 10:40:50 -08:00
Shimeng (Simon) Wang
f90fe961e8 Merge "Pre-calculate view scale and text wrap scale for webkit." 2011-02-24 10:32:18 -08:00
Gilles Debunne
805d00a660 Merge "Cursors correctly displayed with legacy theme." 2011-02-24 10:29:44 -08:00
Gilles Debunne
b13b9aa296 Merge "Text handles movement improvements." 2011-02-24 10:29:22 -08:00
repo sync
8097bccfd9 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
 2011-02-24 10:26:49 -08:00
James Dong
612e3f6819 Merge "Fix MP3Extractor" 2011-02-24 10:11:46 -08:00
Glenn Kasten
3477a8cff2 Merge "Bug 3362814 Fix SMP race in access to mRequestExit" 2011-02-24 10:01:31 -08:00
repo sync
492301161b resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp 
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
 2011-02-24 09:58:25 -08:00
Alon Albert
1f3dcff801 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Glenn Kasten
99cdf2d9ba Merge "Don't crash when parsing DRM MIME types" 2011-02-24 08:17:02 -08:00
Kristian Monsen
820a58675d Merge "Hiding deprecated classes and methods" 2011-02-24 08:02:34 -08:00
Derek Sollenberger
a467e15fb6 Merge "Skia Merge (revision 808)" 2011-02-24 05:27:34 -08:00
Wu-cheng Li
e2a148fae7 Merge "Add YV12 preview format to camera parameter constants." 2011-02-24 02:51:17 -08:00
Xavier Ducrohet
4e9e637400 Merge "LayoutLib: Add debug mode." 2011-02-23 18:32:15 -08:00
Xavier Ducrohet
15081dcff5 Merge "LayoutLib: downsize the SparseArray when possible." 2011-02-23 18:32:10 -08:00
Jason Chen
83bc093ce8 am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:11:21 -08:00
Jason Chen
cba9291560 am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:08:23 -08:00
Irfan Sheriff
9230bf3b9a am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb 
* commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
  DO NOT MERGE Add support for background scanning
 2011-02-23 18:06:02 -08:00
Jason Chen
0b270d3d0e am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 
* commit '5ff79c3b06d7087153617dc973491fc890700af5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
 2011-02-23 18:03:34 -08:00
Irfan Sheriff
48f8e87419 am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb 
* commit '5107eea64e46b0fffbbbcefa469a88044f309de6':
  DO NOT MERGE Add support for background scanning
 2011-02-23 18:02:45 -08:00
Glenn Kasten
7e453a51a5 Bug 3362814 Fix SMP race in access to mRequestExit 
Also fix an unlikely SMP race in access to mHoldSelf on entry to _threadLoop.

Change-Id: I6cbc0b94739c7dd5e77e8a5ba0da22cdc0b1a4db
 2011-02-23 17:49:59 -08:00
Michael Kolb
150e24fe4e Merge "make @hide actually hide" 2011-02-23 17:44:43 -08:00
Jason Chen
9281fda8e0 Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread 2011-02-23 17:23:53 -08:00
Irfan Sheriff
fe35362c3a Merge "DO NOT MERGE Add support for background scanning" into honeycomb 2011-02-23 16:59:55 -08:00
Chet Haase
8956860efc Merge "Fix bug with bad state in animators" 2011-02-23 16:59:03 -08:00
Irfan Sheriff
3083963167 Merge "Remove backup of sleep policy setting" 2011-02-23 16:54:55 -08:00
John Reck
04b32c19d5 Merge "Add x- header to prevent url logging in incognito" 2011-02-23 16:50:24 -08:00
Mike Lockwood
8d320e7259 Merge "GpsLocationProvider: Clean up HAL initialization/cleanup sequence" 2011-02-23 16:40:12 -08:00
Romain Guy
7e18b2c019 Merge "More documentation for Canvas.drawArc()" 2011-02-23 16:32:16 -08:00
Jason Sams
8b03bb20e1 Merge "fix bug 3477451 Bogus asserts with pure compute scripts." 2011-02-23 16:29:41 -08:00
Kenny Root
58fb00eac8 Merge "Fix measurement of external media dir" 2011-02-23 16:27:10 -08:00
Romain Guy
4652e6afc9 Merge "A bit more doc for ListAdapter#areAllItemsEnabled()." 2011-02-23 16:04:07 -08:00
Scott Main
635f2cb58c am b1eea45a: am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit 'b1eea45a71a3fffe3014bbe84226df3c57ddbafc':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:02:13 -08:00
Scott Main
05f5f4e91b am 201959af: Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 
* commit '201959af6e61c148576c77de6cf772456d664251':
  docs: fix sensorevent code snippets bug: 3480932
 2011-02-23 16:00:08 -08:00
Scott Main
096db9ec94 Merge "docs: fix sensorevent code snippets bug: 3480932" into honeycomb 2011-02-23 15:58:13 -08:00
Romain Guy
1c033e356b Merge "Add dither XML attribute support to Gradient and ShapeDrawable." 2011-02-23 15:57:19 -08:00
Jaikumar Ganesh
bbcc437515 Merge "Make BluetoothPan inherit from BluetoothProfile." 2011-02-23 15:50:57 -08:00
Eric Fischer
edcb876cdc am bb0c1a36: (-s ours) am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:38:38 -08:00
Eric Fischer
d189adf1bf am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '32751e3175d8dca96d75b6c93a32557c259c13a7':
  Import revised translations.  DO NOT MERGE
 2011-02-23 15:36:08 -08:00
Eric Fischer
5705228fb0 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-23 15:33:12 -08:00
Mathias Agopian
e364df5a5a Merge "Remove RefBase.h dependency on TextOutput.h" 2011-02-23 15:23:13 -08:00