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

20068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
2ac5b0d6de 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
6709621b5f 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
d8bff004ae Merge "resolved conflicts for merge of 28130bae to master" 2010-08-27 16:12:57 -07:00
Mathias Agopian
5072f60127 Merge "Add KHR_gl_texture_2D_image extension string." 2010-08-27 16:11:27 -07:00
Brad Fitzpatrick
2079dac435 resolved conflicts for merge of 28130bae to master 
Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a
 2010-08-27 16:11:27 -07:00
Mathias Agopian
8e4b5a3e6a Add KHR_gl_texture_2D_image extension string. 2010-08-27 16:08:03 -07:00
Gilles Debunne
b0a8d80513 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
8ec835f7b6 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
5b493c2f7b 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
d77a169b6d 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
d5ac19e793 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
8dd5a64d2c Merge "Fix some SDK build breakage. Not all." 2010-08-27 15:42:19 -07:00
Mathias Agopian
b54263ab73 Merge "cleanup EGL a bit. remove unused extension." 2010-08-27 15:31:19 -07:00
Mathias Agopian
27e2fac337 cleanup EGL a bit. remove unused extension. 
Change-Id: I7758bc7d6dc2e70fc3590fe939ebf71fbcde7059
 2010-08-27 15:30:16 -07:00
Sascha Brawer
395aca11f9 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
8f136d033c Merge "Added MediaSourceSplitter to split single source to multiple ones." 2010-08-27 13:48:15 -07:00
Mathias Agopian
46adfbc949 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
2e48f7e4e3 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
60070c4564 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
543246e0c4 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
4be6b11700 resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp 
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
 2010-08-27 12:08:40 -07:00
Dianne Hackborn
daf5d57ab3 Merge "resolved conflicts for merge of 409b7120 to master" 2010-08-27 12:05:45 -07:00
Dianne Hackborn
6a6875aa7a resolved conflicts for merge of 409b7120 to master 
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
 2010-08-27 12:04:26 -07:00
Mathias Agopian
e5b4978094 Merge "fix a race in SF buffer management" into gingerbread 2010-08-27 11:47:33 -07:00
Wink Saville
443407a081 Merge "Add NetworkProperties to DataConnection." 2010-08-27 11:38:48 -07:00
Brad Fitzpatrick
12831aaacf 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
Romain Guy
82f7cf5732 Merge "Apply gamma correction to font rendering." 2010-08-27 11:31:50 -07:00
Brad Fitzpatrick
879e1ceecb Merge "SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-27 11:21:13 -07:00
Chet Haase
2c9b09fa6f Merge "Fix Sequencer end events when terminated early" 2010-08-27 11:15:51 -07:00
Gilles Debunne
d03f163cf9 am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 
Merge commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4' into gingerbread-plus-aosp

* commit '225ad9cb184c94e29e4e0fb89d5e7d043e399ca4':
  DO NOT MERGE Text selection: tapping on selection opens context menu
 2010-08-27 10:34:56 -07:00
Gilles Debunne
0f6ded9a6a am b8fd0473: Merge "Fix for 512 limit in assetManager.list" into gingerbread 
Merge commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1' into gingerbread-plus-aosp

* commit 'b8fd047311e329f2b8dbe3d228488ba844718ee1':
  Fix for 512 limit in assetManager.list
 2010-08-27 10:34:47 -07:00
Gilles Debunne
4ab6241a8e Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 2010-08-27 10:33:17 -07:00
Gilles Debunne
9c060fe8e0 Merge "Fix for 512 limit in assetManager.list" into gingerbread 2010-08-27 10:32:43 -07:00
Jason parks
261d730905 Merge "Deprecated the managed cursor API's on Activity. Loaders are the new world order." 2010-08-27 09:28:21 -07:00
Bill Napier
f2d251d579 Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:42 -07:00
Joe Onorato
d127ab20e4 Merge "Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into master" 2010-08-27 08:46:04 -07:00
Joe Onorato
de39a5be25 am 8620ed1d: (-s ours) am bc5d9d22: Merge "Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into gingerbread 
Merge commit '8620ed1dd3ca13fd80bcd79090840055a34d90db'

* commit '8620ed1dd3ca13fd80bcd79090840055a34d90db':
  Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF.
 2010-08-27 08:28:33 -07:00
Cary Clark
8c7738865c am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread 
Merge commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c' into gingerbread-plus-aosp

* commit 'c28bf25bc5d9fd729b9e6593168cf61a87cf586c':
  DO NOT MERGE copy selected text on tap
 2010-08-27 08:17:02 -07:00
Cary Clark
eb61092706 Merge "DO NOT MERGE copy selected text on tap" into gingerbread 2010-08-27 08:12:34 -07:00
Brad Fitzpatrick
bbeddcd4b9 am cc033bd3: Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 
Merge commit 'cc033bd367a445d5e3f8de919cd155505b25274c' into gingerbread-plus-aosp

* commit 'cc033bd367a445d5e3f8de919cd155505b25274c':
  Fix some bugs in SettingsProvider that I introduced the other day.
 2010-08-26 17:58:04 -07:00
Brad Fitzpatrick
8a19c2db81 Merge "Fix some bugs in SettingsProvider that I introduced the other day." into gingerbread 2010-08-26 17:54:36 -07:00
Mathias Agopian
0e7f4292c7 fix a race in SF buffer management 
also remove some unused code.

Change-Id: Iae2c3309b7a08055f3e13a5b866c5c084993e352
 2010-08-26 17:42:27 -07:00
Eric Rowe
ae98ee716a am 8f5007ba: am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a' into gingerbread-plus-aosp

* commit '8f5007ba4789e0c9e1a620e7211fa24143a66a0a':
  Improve logging and flexibility of BT stress tests.
 2010-08-26 17:37:00 -07:00
Eric Rowe
97e391e530 am 163fba0a: Merge "Improve logging and flexibility of BT stress tests." into froyo 
Merge commit '163fba0a75dd582aa62187a062faa66d60db0d34' into gingerbread

* commit '163fba0a75dd582aa62187a062faa66d60db0d34':
  Improve logging and flexibility of BT stress tests.
 2010-08-26 17:30:28 -07:00
Eric Rowe
6a8cde145d Merge "Improve logging and flexibility of BT stress tests." into froyo 2010-08-26 17:21:46 -07:00
Dianne Hackborn
f7b610935c Merge "Fix issue #2950374: Fragment#setHasOptionsMenu() doesn't work..." 2010-08-26 16:35:10 -07:00
Jaikumar Ganesh
f1919de71f Merge "Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT" 2010-08-26 16:06:04 -07:00
Andreas Huber
23875dd2b1 am 74ae6973: am 17a765a1: Merge "Support for RTP packets arriving interleaved with RTSP responses." into gingerbread 
Merge commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4'

* commit '74ae6973f8d5b7bc7bc4a7dcac5ddce90f382cd4':
  Support for RTP packets arriving interleaved with RTSP responses.
 2010-08-26 15:52:40 -07:00
Cary Clark
392f707d3f am 3a6bfd4c: (-s ours) am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread 
Merge commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633'

* commit '3a6bfd4cbf35343f5a784d9f970962becdeb0633':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
 2010-08-26 15:52:24 -07:00
Joe Onorato
0e5eb83567 am 03b3de0f: am 00d1772d: am 797e688b: Continue trying to make the turn off quickly after call feature work. 
Merge commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37'

* commit '03b3de0faf7fe6b8e4bfbf828793767ac3e77a37':
  Continue trying to make the turn off quickly after call feature work.
 2010-08-26 15:52:13 -07:00