Commit Graph

9359 Commits

Author SHA1 Message Date
Daniel Sandler
44af754cf0 am d02bdaab: Remove experimental immersive mode support. DO NOT MERGE
Merge commit 'd02bdaab495641ab50e2123fdfd99a819cc40540' into gingerbread-plus-aosp

* commit 'd02bdaab495641ab50e2123fdfd99a819cc40540':
  Remove experimental immersive mode support. DO NOT MERGE
2010-08-27 20:00:29 -07:00
Daniel Sandler
d02bdaab49 Remove experimental immersive mode support. DO NOT MERGE
Bug: 2949215

Change-Id: I7d998ef571ef7e149bb96261430e92150b80b77d
2010-08-27 22:57:39 -04:00
Kenny Root
8328578152 am 7046bd92: Merge "Allow native shared libraries in ASEC containers" into gingerbread
Merge commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3' into gingerbread-plus-aosp

* commit '7046bd924f77c54585b9e0e0c95e5edd2ceb55a3':
  Allow native shared libraries in ASEC containers
2010-08-27 16:45:45 -07:00
Kenny Root
85387d7ba3 Allow native shared libraries in ASEC containers
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.

Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.

Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
2010-08-27 16:40:06 -07:00
Wu-cheng Li
af610b2b9f am 1620d118: Fix SDK build error.
Merge commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12' into gingerbread-plus-aosp

* commit '1620d118a49dc6df7b0e83d7343f8a8bb6e23b12':
  Fix SDK build error.
2010-08-27 15:13:53 -07:00
Wu-cheng Li
1620d118a4 Fix SDK build error.
Change-Id: I4705c10da850d684caa7067d656aff11bc65acbb
2010-08-27 15:09:20 -07:00
Wu-cheng Li
705c2e66dc am d851e6fe: Merge "Unhide camera fps range API and deprecate old ones." into gingerbread
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp

* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
  Unhide camera fps range API and deprecate old ones.
2010-08-27 14:22:21 -07:00
Wu-cheng Li
5f1e69c76e Unhide camera fps range API and deprecate old ones.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
2010-08-27 14:19:32 -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
Brad Fitzpatrick
28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp
Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718
2010-08-27 12:08:40 -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
Brad Fitzpatrick
c6b0b7755c Document blocking behavior of ImageView setImageURI and setImageResource
Change-Id: I3b0633321229cad80ebf32e052c0db170a56de21
2010-08-27 11:43:56 -07:00
Brad Fitzpatrick
6b50986a6b Merge "SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-27 11:21:13 -07:00
Gilles Debunne
d2420248fa DO NOT MERGE Removed "Stop selecting text" option.
Change-Id: Ic553d099664d1703a39139e7440d583cfec20d76
2010-08-27 10:49:14 -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
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
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
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: edf32d0131

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
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
Amith Yamasani
4b4114d155 am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text.
Merge commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071' into gingerbread-plus-aosp

* commit 'a90b7f0125389b9e1040d2be82aad4ef74ea6071':
  Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
2010-08-26 14:57:31 -07:00
Amith Yamasani
a90b7f0125 Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()
to return the selected text.

setComposingRegion:

The TextView may choose to highlight the text in some way (underline for now) to indicate
that the text is selected for correction, if the IME wants to provider alternatives.

Choosing an alternative in the IME can then call IC.commitText() to replace the highlighted
(not selected) text with a different candidate.

This change also ensures that any existing spans/styles are not wiped out. So we can now
correct rich text as well.

getSelectedText:

This is a convenience to get the selected text instead of using extracted text that is
more heavy weight. Existing getTextBeforeCursor() and getTextAfterCursor() fail to
retrieve the selected text, only what's before and after the selection.

Change-Id: Ieb5ecd5ff947ea04958589f501e7bd5228e00fb5
2010-08-26 14:53:39 -07:00
David Brown
b4298cd8ba am 846eb30f: Add SipAddress to ContactsContract.
Merge commit '846eb30f78a9153102c743c2c1b49de1a4079fb1' into gingerbread-plus-aosp

* commit '846eb30f78a9153102c743c2c1b49de1a4079fb1':
  Add SipAddress to ContactsContract.
2010-08-26 14:52:10 -07:00
David Brown
846eb30f78 Add SipAddress to ContactsContract.
This is a new data kind representing a SIP address for a contact.
The new class is ContactsContract.CommonDataKinds.SipAddress,
and the new mime type is "vnd.android.cursor.item/sip_address".

It's pretty generic right now (basically a single text field, like
"Website") but we may eventually want to extend it later to have multiple
labels+types (like phone numbers.)

Bug: 2942998

Change-Id: I45d90a680a3badf60bccb5aafdc2397037494e95
2010-08-26 14:49:29 -07:00
Dianne Hackborn
409b71201a am 02486b13: Hide heavy-weight API.
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp

* commit '02486b1327e3007c62d253dd89ba9db1852b87f8':
  Hide heavy-weight API.
2010-08-26 14:46:43 -07:00
Dianne Hackborn
02486b1327 Hide heavy-weight API.
And give it a better name, for when it is later un-hidden.

Change-Id: Iae0d3054d44f873b9f953bc41d175a47802a185e
2010-08-26 14:41:58 -07:00
Cary Clark
4e43744301 DO NOT MERGE copy selected text on tap
Change-Id: I4175a3e66cda7f26353fbbd98e65639fd91b2bb9
http://b/2626451
2010-08-26 17:36:01 -04:00
Cary Clark
3a6bfd4cbf am ed101933: Merge "DO NOT MERGE -- copy on tapping outside of selected text in gmail" into gingerbread
Merge commit 'ed101933ab7506d841d6eaa7bebda4b674c38088' into gingerbread-plus-aosp

* commit 'ed101933ab7506d841d6eaa7bebda4b674c38088':
  DO NOT MERGE -- copy on tapping outside of selected text in gmail
2010-08-26 12:08:05 -07:00
Cary Clark
8b0b772336 DO NOT MERGE -- copy on tapping outside of selected text in gmail
Text can be selected in gmail by choosing Select Text from the
menu and dragging the selection. There's no pretend action bar
like there is in the Browser to commit the selection.

When tapping outside of the selection, copy the text, if
the client (like gmail) has mapped the trackball to the
arrow keys.

Change-Id: I7dd133fd860d392bb01ec103e379e1f1d2a43e64
http://b/2626451
2010-08-26 14:53:57 -04:00
Gilles Debunne
b318ef79d5 am 62dbd82a: Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Merge commit '62dbd82aad0f84c88212566321e3fb370affaf7c' into gingerbread-plus-aosp

* commit '62dbd82aad0f84c88212566321e3fb370affaf7c':
  Fix for IndexOutOfBounds in TextView getWordLimitsAt.
2010-08-26 11:52:44 -07:00
Gilles Debunne
62dbd82aad Fix for IndexOutOfBounds in TextView getWordLimitsAt.
Bug http://b/issue?id=2948904

Change-Id: I10008374da92d5a98ec567cc76732383e66c4c5b
2010-08-26 11:12:16 -07:00
Gilles Debunne
f309c7a869 am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp

* commit '1b400c7763e63505bafd496953764c3e97c2be5b':
  Fix for NPE in TextView.
2010-08-26 11:01:34 -07:00
Gilles Debunne
1b400c7763 Merge "Fix for NPE in TextView." into gingerbread 2010-08-26 10:58:58 -07:00
Dianne Hackborn
efd05ea69a am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
2010-08-26 10:50:11 -07:00
Dianne Hackborn
0a7f5fc474 Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 2010-08-26 10:47:48 -07:00
Dianne Hackborn
9dae48e399 Fix issue #2951784: Launcher crashes on startup
Change-Id: I98aedacce9a7d6b8bc168f39ea5489b40dc0ec8d
2010-08-26 10:20:01 -07:00
Robert Greenwalt
4ea54f442e Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp 2010-08-26 08:29:10 -07:00
Dianne Hackborn
66d633d208 am 3003a017: Merge "Don\'t retain global ref to last inflated context." into gingerbread
Merge commit '3003a017d312a55e3804d6cf4a80044b1f1d7993' into gingerbread-plus-aosp

* commit '3003a017d312a55e3804d6cf4a80044b1f1d7993':
  Don't retain global ref to last inflated context.
2010-08-25 22:02:18 -07:00
Dianne Hackborn
3003a017d3 Merge "Don't retain global ref to last inflated context." into gingerbread 2010-08-25 22:00:28 -07:00
Dianne Hackborn
7e269644fc Don't retain global ref to last inflated context.
Also rework URI permission granting to support upcoming
clipboard use.

Change-Id: I9842920350955531c5a511c2ecc5215e8c783343
2010-08-25 21:50:54 -07:00
Gilles Debunne
df4ee43062 Fix for NPE in TextView.
Bug http://b/issue?id=2941549

Change-Id: Id5cbf0a3b2b68f450a9271333b96d41b01aa9f5c
2010-08-25 19:15:10 -07:00
Robert Greenwalt
b21b62327c resolved conflicts for merge of b998f311 to gingerbread-plus-aosp
Change-Id: I7ceb0b624e78d85542d1c36bfabeb5dc31961505
2010-08-25 17:48:47 -07:00
Konstantin Lopyrev
5a54e98022 am 6947cc59: Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread
Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp

* commit '6947cc594276df899a0c4662224455f40846bd0a':
  Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.
2010-08-25 17:37:45 -07:00
Konstantin Lopyrev
6947cc5942 Merge "Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared." into gingerbread 2010-08-25 17:35:50 -07:00
Mathias Agopian
a62dfe9e49 am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread
Merge commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3' into gingerbread-plus-aosp

* commit '94e939e8794727f4f74839de23c5ac5f0d9f84b3':
  Improve Sensors documentation a bit
2010-08-25 16:07:25 -07:00
Mathias Agopian
94e939e879 Merge "Improve Sensors documentation a bit" into gingerbread 2010-08-25 16:03:58 -07:00
Brad Fitzpatrick
49209cbcef am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread
Merge commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4' into gingerbread-plus-aosp

* commit 'd0e6598b4a32f3000247341414449a3aa4d9f7f4':
  Start of SharedPreferences$Editor.startCommit()
2010-08-25 15:19:57 -07:00
Brad Fitzpatrick
d0e6598b4a Merge "Start of SharedPreferences$Editor.startCommit()" into gingerbread 2010-08-25 15:15:30 -07:00