29653 Commits

Author SHA1 Message Date
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
Joe Onorato
3fec2bf9bf Clean up the mess
Change-Id: Id3745d6e97d90443dcc0fd29fa047090c489adb3
2010-08-27 15:34:00 -04: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
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
Romain Guy
3750f64dce Merge "Apply gamma correction to font rendering." 2010-08-27 11:31:50 -07:00
Romain Guy
b45c0c9774 Apply gamma correction to font rendering.
Change-Id: I1b05f40e356221b2a5eb9400e67d77ecd98ed6c4
2010-08-27 11:31:24 -07:00
Brad Fitzpatrick
f52870948d Fix closing tag in docs.
BUG=2956223

Change-Id: I0772d0b5386a783762319064c13d567c124da394
2010-08-27 11:22:50 -07:00
Brad Fitzpatrick
6b50986a6b Merge "SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-27 11:21:13 -07:00
Chet Haase
d970432538 Merge "Fix Sequencer end events when terminated early" 2010-08-27 11:15:51 -07:00
Wink Saville
1f6408a96c Add NetworkProperties to DataConnection.
Since we have NetworkProperties we can remove the individual accessors
from Phone and its subclasses.

Change-Id: Id9969a880405900a63051b3ae4019d889afb1fe8
2010-08-27 11:15:18 -07:00
Dianne Hackborn
1040dc465c Improve clipboard API.
- Rename ClippedData to ClipData.
- Introudce ClipDescription subclass.
- Add convenience APIs for creating a ClipData.
- Add ClipboardManager API to get just the ClipDescription.
- Define MIME types associated with a clip.

Change-Id: If97ef91aa99a4dd0ec74ccaea504345c9ef12b5c
2010-08-27 11:06:01 -07:00
Dmitri Plotnikov
59024f1697 Unhinding more ContactsContract APIs.
Turns out we need more ContactsContract APIs to
be unhidden in order to support unbundled directories.

Change-Id: If212e769bb32cd6806e39217935d189f9d43ea67
2010-08-27 10:59:22 -07:00
Gilles Debunne
dfad42760f 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
084dd872b1 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
225ad9cb18 Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread 2010-08-27 10:33:17 -07:00
Gilles Debunne
b8fd047311 Merge "Fix for 512 limit in assetManager.list" into gingerbread 2010-08-27 10:32:43 -07:00
Gilles Debunne
45b2d699e1 DO NOT MERGE Text selection: tapping on selection opens context menu
Back key exit selection mode. No more "Stop selecting text" in second context menu.

A tap on one of the handles also triggers the second context menu.

Paste is only available on long press in first menu for empty text fields.

Change-Id: Ic4fa00458d4f617a81885436b53d4fc923347609
2010-08-27 10:29:59 -07:00
Jason parks
e73d10c6fb 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
db53e0ef66 Merge "Fix MonkeyRunner SDK documentation generation." 2010-08-27 09:10:42 -07:00
Brad Fitzpatrick
333b8cba99 SharedPreferences$Editor.startCommit()
Adds a fire-and-forget save method (startCommit) to the
SharedPreferences.Editor, which is the way most people use it anyway.

This commit adds the implementation.  The previous commit added the
interface and docs:

   previous change: Idf9934b445da1fb72b79f0192218b47c0a7f5a34
        git commit: edf32d01316bd3432c023f17747461b08ae36375

In addition, this change:

-- adds a generic "runPendingWorkFinishers" mechanism to
   ActivityThread to wait on async operations that are still
   in flight and use it for this.

-- ties runPendingWorkFinishers into Activity.onPause,
   BroadcastReceiver, and Service.

-- makes sSharedPreferences keyed on name, not File, to avoid
   unnnecessary allocations

-- documents and guarantees what thread
   OnSharedPreferenceChangeListener callbacks run on

-- makes a few things in frameworks/base use startCommit(), notably
   Preference.java (which was ignoring the return value anyway)

Change-Id: I1c8db60ad45643226fe6d246d3e513eeb7bd0ebd
2010-08-27 09:10:11 -07:00
Joe Onorato
c303299198 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
Chet Haase
1e0ac5a106 Fix Sequencer end events when terminated early
Change-Id: I3e10d17000182419219dbd1243d42cd0ecda7aa0
2010-08-27 08:36:59 -07:00
Joe Onorato
8deae99ba1 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
Joe Onorato
88e517ec71 Hand merge bc5d9d22: Need to close the windowshade on ACTION_CLOSE_SYSTEM_DIALOGS and ACTION_SCREEN_OFF." into
master

Change-Id: I4e42155d231f92893c48ffe911e3dfce9d70eb49
2010-08-27 11:21:26 -04:00
Cary Clark
04108437ed 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
c28bf25bc5 Merge "DO NOT MERGE copy selected text on tap" into gingerbread 2010-08-27 08:12:34 -07:00
Jason parks
6ed50de6d1 Deprecated the managed cursor API's on Activity. Loaders are the new world order.
Change-Id: I0c7d403e9e6c0fcdf6fea886d8c284341e2f6c88
2010-08-27 09:29:15 -05:00
Sascha Brawer
949b60f695 Added default map boundaries for locale rm-CH.
Cloned from values-de-rCH/arrays.xml.

Change-Id: Ib6d2692e2993833767a4bb74d40dec4831586002
2010-08-27 11:51:51 +02:00