Commit Graph

18142 Commits

Author SHA1 Message Date
Jake Hamby
6cee99c76b Merge "Allow incoming SMS until internal storage is almost full." into gingerbread 2010-09-08 12:49:27 -07:00
Jeff Brown
8a8a4f52ee am de2f3340: Update current.xml for touch filtering feature.
Merge commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0' into gingerbread-plus-aosp

* commit 'de2f3340d64e20e51029ff438f0d635d97b8a3e0':
  Update current.xml for touch filtering feature.
2010-09-08 12:29:49 -07:00
Jeff Brown
61ce3982e1 Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
2010-09-08 12:28:43 -07:00
Jeff Brown
9c9021c2d4 am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
2010-09-08 11:55:24 -07:00
Jeff Brown
af30ff6020 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Jean-Baptiste Queru
0940dfb829 Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp 2010-09-08 11:03:22 -07:00
Erik
07b072ad2f am c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe' into gingerbread-plus-aosp

* commit 'c0b4f6d30d962d75125628317b5f5ea622531dfe':
  Adds a time zone parameter to formatDateRange
2010-09-08 11:01:27 -07:00
Erik
d71a3160ae Merge "Adds a time zone parameter to formatDateRange" into gingerbread 2010-09-08 10:58:12 -07:00
Gilles Debunne
486d70d27a am 468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743' into gingerbread-plus-aosp

* commit '468394fc6d1cb0c9078c2f98aa056860f7e0d743':
  Text Selection: smart word detection. DO NOT MERGE.
2010-09-08 10:32:42 -07:00
Elliott Hughes
3077e21d2b am 4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp

* commit '4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
  Remove dead code: NIOBuffer.
2010-09-08 10:32:38 -07:00
Chung-yih Wang
fd857d1589 am 66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '669070787cc10377c2e5c3fa187babc728d96245' into gingerbread-plus-aosp

* commit '669070787cc10377c2e5c3fa187babc728d96245':
  Fix the dialing from contact for internet address.
2010-09-08 10:32:13 -07:00
Chung-yih Wang
205b84897c am 5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770' into gingerbread-plus-aosp

* commit '5de1d36dd0415c4cf9afdf093a4915951ef6c770':
  Log outbound proxy address if exists for debugging.
2010-09-08 10:28:09 -07:00
Jean-Baptiste Queru
0e1ce57218 resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
2010-09-08 10:02:35 -07:00
Elliott Hughes
1edbc7e431 Merge "Remove dead code: NIOBuffer." into gingerbread 2010-09-08 09:30:41 -07:00
Chung-yih Wang
0f55fb95d4 Merge "Fix the dialing from contact for internet address." into gingerbread 2010-09-08 03:32:01 -07:00
Wei-Ta Chen
8b0de0ee31 am 1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Merge commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49' into gingerbread-plus-aosp

* commit '1b214be92ac206d8ac6ef4967db6e2859d91ab49':
  Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
2010-09-07 21:48:48 -07:00
Gilles Debunne
0dfd31013b am d6e56895: update-api step missing from 64963.
Merge commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp

* commit 'd6e56895f647d3c6ea33cea15fdb7b1e9ff3f537':
  update-api step missing from 64963.
2010-09-07 21:48:39 -07:00
Brad Fitzpatrick
6eba882d83 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
2010-09-07 21:41:09 -07:00
Neal Nguyen
e1446fa12e Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread 2010-09-07 20:55:22 -07:00
Wei-Ta Chen
731e3428fb Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread 2010-09-07 20:36:13 -07:00
Brad Fitzpatrick
9a994a0796 Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread 2010-09-07 20:06:26 -07:00
Hung-ying Tyan
b4dab55191 am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b' into gingerbread-plus-aosp

* commit 'd580eee29b50e1f11485b655fe5e6cc5a564615b':
  SipPhone: switch to its own phone type PHONE_TYPE_SIP.
2010-09-07 19:40:40 -07:00
Hung-ying Tyan
3386566558 Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread 2010-09-07 19:37:33 -07:00
Kenny Root
c41ba2bd56 am a19ef306: Revert "Free created FileMap when uncompressing files"
Merge commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889' into gingerbread-plus-aosp

* commit 'a19ef306bd0a257c67b50f5e0e669e9fe52b0889':
  Revert "Free created FileMap when uncompressing files"
2010-09-07 19:35:47 -07:00
Kenny Root
dc2d840ff7 Revert "Free created FileMap when uncompressing files"
This reverts commit 52b8235238fb4d8cf141020cc1ae33880929dc3f.

munmap() on a region that overlaps something else (e.g, the ZIP Central
Directory in this case) unmaps those other regions as well making the
ZipFileRO class unhappy. Revert this for now until we can have FileMap
deal with this craziness.
2010-09-07 19:30:22 -07:00
Gilles Debunne
e050c1fe16 am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp

* commit '883bbb72284736b5601f9e96d1116969c51b75de':
  Hide mCursorController field in ArrowKeyMovementMethod.
2010-09-07 18:59:22 -07:00
Gilles Debunne
55ca8a544f am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e' into gingerbread-plus-aosp

* commit 'dbd25cdbc3dcad573aaeaf493bc186006bce3d8e':
  Made text selection work in ExtractEditText. DO NOT MERGE
2010-09-07 18:59:10 -07:00
Gilles Debunne
cfaf307ec5 Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread 2010-09-07 18:53:55 -07:00
Dmitry Shmidt
77b534aab2 am d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit 'd0f74ae081bac9a9c8f7faf9288305647735d743' into gingerbread-plus-aosp

* commit 'd0f74ae081bac9a9c8f7faf9288305647735d743':
  Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
2010-09-07 17:33:55 -07:00
Dmitry Shmidt
f0b9cf3d6a Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread 2010-09-07 17:29:45 -07:00
Wei-Ta Chen
3aa370e3cd am b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628' into gingerbread-plus-aosp

* commit 'b356f8acec9fdfd36f01e5cca4fe3a28ecd6e628':
  Rename LargeBitmap to BitmapRegionDecoder for having a better API.
2010-09-07 17:07:12 -07:00
Wei-Ta Chen
4211ee8c3b Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread 2010-09-07 17:01:57 -07:00
Dianne Hackborn
d1b5f0c4ae am 2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea' into gingerbread-plus-aosp

* commit '2d3739d479d67ba736cefbdd6087a11eadfb14ea':
  Modify native ALooper to take an explicit ident.
2010-09-07 16:38:45 -07:00
Dianne Hackborn
9556ef4f84 Merge "Modify native ALooper to take an explicit ident." into gingerbread 2010-09-07 16:32:48 -07:00
Dianne Hackborn
45e0acb41a Modify native ALooper to take an explicit ident.
The ALooper API now uses an explicit "identifier" for the integer
that is returned rather than implicitly using the fd.  This allows
the APIs that had the fd to be a little more sane.

Change-Id: I8507f535ad484c0bdc4a1bd016d87bb09acd7ff0
2010-09-07 15:46:55 -07:00
Kenny Root
1e947e3650 am 25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '254293782a94652fd601d6b3f04ad447c072f714' into gingerbread-plus-aosp

* commit '254293782a94652fd601d6b3f04ad447c072f714':
  Allow installd to handle large partitions
2010-09-07 15:42:02 -07:00
Kenny Root
dc3f166282 Merge "Allow installd to handle large partitions" into gingerbread 2010-09-07 15:38:31 -07:00
Elliott Hughes
02d2d4ecd2 am 45cda90b: Merge "Be brief." into gingerbread
Merge commit '45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp

* commit '45cda90bdc178e253049c7067c78bf4b1204ba82':
  Be brief.
2010-09-07 14:46:15 -07:00
Joe Onorato
668c7150aa am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
2010-09-07 14:46:08 -07:00
Elliott Hughes
6334b1860b Merge "Be brief." into gingerbread 2010-09-07 14:41:36 -07:00
Joe Onorato
df67235b0f Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread 2010-09-07 14:41:12 -07:00
Makoto Onuki
452fc5bbc3 am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
2010-09-07 14:34:19 -07:00
Makoto Onuki
32d9abcdc1 Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread 2010-09-07 14:31:34 -07:00
Dianne Hackborn
2323b0e502 am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026' into gingerbread-plus-aosp

* commit '6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026':
  Fixes to battery stats debug output.
2010-09-07 14:15:17 -07:00
Dianne Hackborn
dd5572047a Merge "Fixes to battery stats debug output." into gingerbread 2010-09-07 14:10:38 -07:00
Dianne Hackborn
d8f1a656cb am 11bbe200: Hopefully fix the build.
Merge commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5' into gingerbread-plus-aosp

* commit '11bbe200cba150cfa5593bb87b54f3072a5ab2c5':
  Hopefully fix the build.
2010-09-07 12:36:33 -07:00
Dianne Hackborn
bb39b9f17b Hopefully fix the build.
Change-Id: Id8cd92c0895c9939e1386ef488bd1309a3be3568
2010-09-07 12:32:19 -07:00
Dianne Hackborn
c21e0e2d0c am f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7' into gingerbread-plus-aosp

* commit 'f703b77c96a6d133fda534158eaf6190ff7c87f7':
  Add system property to turn off scheduling groups.
2010-09-07 11:30:08 -07:00
Dianne Hackborn
bd89ff87d2 Merge "Add system property to turn off scheduling groups." into gingerbread 2010-09-07 11:27:26 -07:00
Dianne Hackborn
7b0d45c346 Add system property to turn off scheduling groups.
Do this:

adb shell setprop debug.sys.noschedgroups 1

Change-Id: I6e06a74205fd45ee1526ce71fe33944465d39984
2010-09-07 11:19:11 -07:00