drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,681 Commits 1 Branch 0 Tags
Commit Graph

29681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Greenwalt
fc40701c8b Merge "resolved conflicts for merge of 4ea54f44 to master" 2010-08-27 17:27:02 -07:00
Romain Guy
9841ae8245 Merge "Add test for gamma correction." 2010-08-27 16:56:24 -07:00
Romain Guy
4299c0f242 Add test for gamma correction. 
Change-Id: Id2a311bc116438d3627a943cb5fb1ba8dc121bb0
 2010-08-27 16:56:50 -07:00
Daniel Lehmann
fff98cd16b Merge "Perform a float division for screenTravelCount" 2010-08-27 16:45:49 -07:00
Daniel Lehmann
4ef1da3c04 Perform a float division for screenTravelCount 
Change-Id: Ie0f23344a26c7ecf1a641e60d649ad0fc54fecbf
 2010-08-27 16:40:59 -07:00
Jim Miller
9a96e96208 Merge "Fix 2797185: Show 3D Recents on xlarge device" 2010-08-27 16:38:11 -07:00
Kenny Root
7a97e5a21e am 8e724905: am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread 
Merge commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d'

* commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d':
  Add debugging to ZipFileRO
 2010-08-27 16:18:44 -07:00
Gilles Debunne
71eaac0880 am 95464c9a: am 445ab76c: Merge "Broken build. Missing ;" into gingerbread 
Merge commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85'

* commit '95464c9aa063d2e36a0385a60edd6ee519ed2d85':
  Broken build. Missing ;
 2010-08-27 16:18:37 -07:00
Gilles Debunne
2b9e4229a2 am aeaf2830: (-s ours) am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 
Merge commit 'aeaf2830f5ab81e6f95062514239081af65a914f'

* commit 'aeaf2830f5ab81e6f95062514239081af65a914f':
  DO NOT MERGE Removed "Stop selecting text" option.
 2010-08-27 16:18:31 -07:00
Brad Fitzpatrick
a222510af8 am 2479097e: am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit '2479097ecb899f1e193063e3ce126c721e13c455'

* commit '2479097ecb899f1e193063e3ce126c721e13c455':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 16:18:24 -07:00
Mathias Agopian
54c4bf2743 am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'

* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
  fix a race in SF buffer management
 2010-08-27 16:18:12 -07:00
Brad Fitzpatrick
4dcea37d48 am e339c096: am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit 'e339c0968e781f28e0c690afc746ea3d16aba146'

* commit 'e339c0968e781f28e0c690afc746ea3d16aba146':
  Fix closing tag in docs.
 2010-08-27 16:18:03 -07:00
Brad Fitzpatrick
505735b1cc Merge "resolved conflicts for merge of 28130bae to master" 2010-08-27 16:12:57 -07:00
Mathias Agopian
1ec505668b Merge "Add KHR_gl_texture_2D_image extension string." 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
7f7ce40f90 resolved conflicts for merge of 28130bae to master 
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
 2010-08-27 16:11:27 -07:00
Mathias Agopian
b20a4b960e Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Gilles Debunne
6ff0dc0ad9 am dfad4276: (-s ours) am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit 'dfad42760f3c9c3b8439ff4b365256474471abe4'

* commit 'dfad42760f3c9c3b8439ff4b365256474471abe4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 16:06:22 -07:00
Gilles Debunne
a16fb779d5 am 084dd872: am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit '084dd872b1bf9f7de87554d40d89df1f30b11c45'

* commit '084dd872b1bf9f7de87554d40d89df1f30b11c45':
  Fix for 512 limit in assetManager.list
 2010-08-27 16:06:13 -07:00
Cary Clark
2af36856e1 am 04108437: (-s ours) am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread 
Merge commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480'

* commit '04108437eda79fc2bad1eb2adf5247c9f4dbc480':
  DO NOT MERGE copy selected text on tap
 2010-08-27 16:05:23 -07:00
Brad Fitzpatrick
c026d5cf2f am 603a1f59: am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 
Merge commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22'

* commit '603a1f59703109c89ec0fdeceb0f8d28c7cede22':
  Fix some bugs in SettingsProvider that I introduced the other day.
 2010-08-27 15:52:56 -07:00
Eric Rowe
bfa6d1dbe4 am aed5d62a: am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit 'aed5d62ac1278c032528921798529dbd824a1865'

* commit 'aed5d62ac1278c032528921798529dbd824a1865':
  Improve logging and flexibility of BT stress tests.
 2010-08-27 15:52:33 -07:00
Dianne Hackborn
8e3d2382db Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Dianne Hackborn
f6d952bbc8 Fix some SDK build breakage. Not all. 
Change-Id: I2791b0a7c48d03cb6e5ca93771efb56c0a0c1956
 2010-08-27 15:41:13 -07:00
Mathias Agopian
df25b0ec94 Merge "cleanup EGL a bit. remove unused extension." 2010-08-27 15:31:19 -07:00
Mathias Agopian
9d75f13415 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Sascha Brawer
d5426d7f61 Merge "Added default map boundaries for locale rm-CH. Cloned from values-de-rCH/arrays.xml." 2010-08-27 14:37:19 -07:00
Nipun Kwatra
cf66e47ddd Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
Nipun Kwatra
f83cba77b6 Added MediaSourceSplitter to split single source to multiple ones. 
MediaSourceSplitter provides a way to split a single mediaSource
into multiple sources. It takes in the real mediaSource and multiple
clients can then be created which serve from the same real mediaSource.

Change-Id: I7254ead24b4c26c784b033e6bc7ff5a0d083a0c3
 2010-08-27 13:46:41 -07:00
Kenny Root
8e72490526 am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread 
Merge commit 'ad6731b0fc759e446504bca163d8fd2fb6326577' into gingerbread-plus-aosp

* commit 'ad6731b0fc759e446504bca163d8fd2fb6326577':
  Add debugging to ZipFileRO
 2010-08-27 13:00:22 -07:00
Kenny Root
ad6731b0fc Merge "Add debugging to ZipFileRO" into gingerbread 2010-08-27 12:58:00 -07:00
Kenny Root
6329fdbded Add debugging to ZipFileRO 
Some assets are failing to read from ZIP files. This adds a bit more
debugging to figure out what's going on.

Change-Id: Id90e10546c54c85069a34478fbc28bc2523bda5d
 2010-08-27 12:47:34 -07:00
Joe Onorato
3fec2bf9bf Clean up the mess 
Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
 2010-08-27 15:34:00 -04:00
Gilles Debunne
95464c9aa0 am 445ab76c: Merge "Broken build. Missing ;" into gingerbread 
Merge commit '445ab76c49779998543bb78881f5d9f8ae81e598' into gingerbread-plus-aosp

* commit '445ab76c49779998543bb78881f5d9f8ae81e598':
  Broken build. Missing ;
 2010-08-27 12:23:47 -07:00
Gilles Debunne
aeaf2830f5 am e69b2860: Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 
Merge commit 'e69b286005b0b543e274f523d894e069811215a6' into gingerbread-plus-aosp

* commit 'e69b286005b0b543e274f523d894e069811215a6':
  DO NOT MERGE Removed "Stop selecting text" option.
 2010-08-27 12:23:43 -07:00
Brad Fitzpatrick
2479097ecb am b94493fe: Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 
Merge commit 'b94493feaf8b7a620a25c23c1f131a999ed61293' into gingerbread-plus-aosp

* commit 'b94493feaf8b7a620a25c23c1f131a999ed61293':
  Document blocking behavior of ImageView setImageURI and setImageResource
 2010-08-27 12:23:39 -07:00
Mathias Agopian
d322d16323 am ae66946b: Merge "fix a race in SF buffer management" into gingerbread 
Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp

* commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30':
  fix a race in SF buffer management
 2010-08-27 12:23:35 -07:00
Brad Fitzpatrick
e339c0968e am 9020595b: am f5287094: Fix closing tag in docs. 
Merge commit '9020595b7f376bb414c9a6dba216dec76ababb17' into gingerbread-plus-aosp

* commit '9020595b7f376bb414c9a6dba216dec76ababb17':
  Fix closing tag in docs.
 2010-08-27 12:23:30 -07:00
Amith Yamasani
f956fd6d13 am 4b4114d1: am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text. 
Merge commit '4b4114d155b4f3d5cc4179934cb6403b1776261d'

* commit '4b4114d155b4f3d5cc4179934cb6403b1776261d':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
 2010-08-27 12:14:46 -07:00
David Brown
93637d3ee7 am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract. 
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c'

* commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c':
  Add SipAddress to ContactsContract.
 2010-08-27 12:14:13 -07:00
Brad Fitzpatrick
28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp 
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
 2010-08-27 12:08:40 -07:00
Dianne Hackborn
0430dcf174 Merge "resolved conflicts for merge of 409b7120 to master" 2010-08-27 12:05:45 -07:00
Dianne Hackborn
41bfa37cb2 resolved conflicts for merge of 409b7120 to master 
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
 2010-08-27 12:04:26 -07:00
Gilles Debunne
445ab76c49 Merge "Broken build. Missing ;" into gingerbread 2010-08-27 11:52:27 -07:00
Gilles Debunne
0db187a3e6 Broken build. Missing ; 
Change-Id: Ic266e491a73fb3df00e77111a4ad9f270741c28b
 2010-08-27 11:51:34 -07:00
Gilles Debunne
e69b286005 Merge "DO NOT MERGE Removed "Stop selecting text" option." into gingerbread 2010-08-27 11:50:26 -07:00
Brad Fitzpatrick
b94493feaf Merge "Document blocking behavior of ImageView setImageURI and setImageResource" into gingerbread 2010-08-27 11:49:31 -07:00
Mathias Agopian
ae66946bd9 Merge "fix a race in SF buffer management" into gingerbread 2010-08-27 11:47:33 -07:00
Brad Fitzpatrick
c6b0b7755c Document blocking behavior of ImageView setImageURI and setImageResource 
Change-Id: I3b0633321229cad80ebf32e052c0db170a56de21
 2010-08-27 11:43:56 -07:00
Wink Saville
db4c91ff7b Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Brad Fitzpatrick
9020595b7f am f5287094: Fix closing tag in docs. 
Merge commit 'f52870948d5d57d033fcdafc9c3fb0a872975447' into gingerbread

* commit 'f52870948d5d57d033fcdafc9c3fb0a872975447':
  Fix closing tag in docs.
 2010-08-27 11:35:53 -07:00