OSDN Git Service
Mathias Agopian [Wed, 8 Sep 2010 23:50:13 +0000 (16:50 -0700)]
am
3fa7d8af: am
9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '
3fa7d8af6560de07ef673f73308f7e51de64e4ec'
* commit '
3fa7d8af6560de07ef673f73308f7e51de64e4ec':
Force wallpaper surface to 565.
Mathias Agopian [Wed, 8 Sep 2010 23:46:46 +0000 (16:46 -0700)]
am
9bfb060a: Merge "Force wallpaper surface to 565." into gingerbread
Merge commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '
9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
Mathias Agopian [Wed, 8 Sep 2010 23:43:42 +0000 (16:43 -0700)]
Merge "Force wallpaper surface to 565." into gingerbread
Adam Powell [Wed, 8 Sep 2010 23:14:47 +0000 (16:14 -0700)]
Merge "Added resources and styles for ActionBar tabs"
John Wang [Wed, 8 Sep 2010 23:00:11 +0000 (16:00 -0700)]
am
d8f62ec4: am
a48dc39b: Add hangupForegroundResumeBackground().
Merge commit '
d8f62ec44706153490bf63cddeac7d9c76e9e742'
* commit '
d8f62ec44706153490bf63cddeac7d9c76e9e742':
Add hangupForegroundResumeBackground().
John Wang [Wed, 8 Sep 2010 22:56:41 +0000 (15:56 -0700)]
am
a48dc39b: Add hangupForegroundResumeBackground().
Merge commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12' into gingerbread-plus-aosp
* commit '
a48dc39bd55c5ddcd991e08f791fd18d94a0db12':
Add hangupForegroundResumeBackground().
Brad Fitzpatrick [Wed, 8 Sep 2010 22:51:41 +0000 (15:51 -0700)]
am
f2bf6d6e: am
65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '
f2bf6d6e705b655a546a9e6435e6acef3a82cda3'
* commit '
f2bf6d6e705b655a546a9e6435e6acef3a82cda3':
Don't block in the BackupManagerService.dataChanged() Binder call.
Gilles Debunne [Wed, 8 Sep 2010 22:50:50 +0000 (15:50 -0700)]
am
de5cfcb6: am
d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit '
de5cfcb608f3432d98ae17e0febb6e726df79e90'
* commit '
de5cfcb608f3432d98ae17e0febb6e726df79e90':
Fix for a memory leak in TextKeyListener.
Robert Greenwalt [Wed, 8 Sep 2010 22:35:40 +0000 (15:35 -0700)]
Merge "Some cleanup of Proxy class."
Brad Fitzpatrick [Wed, 8 Sep 2010 22:26:57 +0000 (15:26 -0700)]
am
65634a79: Merge "Don\'t block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Merge commit '
65634a7935ed6f173179e7ac91a05288693b2bbf' into gingerbread-plus-aosp
* commit '
65634a7935ed6f173179e7ac91a05288693b2bbf':
Don't block in the BackupManagerService.dataChanged() Binder call.
Brad Fitzpatrick [Wed, 8 Sep 2010 22:20:20 +0000 (15:20 -0700)]
Merge "Don't block in the BackupManagerService.dataChanged() Binder call." into gingerbread
Romain Guy [Wed, 8 Sep 2010 22:16:13 +0000 (15:16 -0700)]
Merge "Fix possible infinite loop when purging textures."
Gilles Debunne [Wed, 8 Sep 2010 22:02:20 +0000 (15:02 -0700)]
am
d9c80ab3: Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Merge commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050' into gingerbread-plus-aosp
* commit '
d9c80ab31ac3755141765e2c030bd1404ff0b050':
Fix for a memory leak in TextKeyListener.
Gilles Debunne [Wed, 8 Sep 2010 21:58:23 +0000 (14:58 -0700)]
Merge "Fix for a memory leak in TextKeyListener." into gingerbread
Dianne Hackborn [Wed, 8 Sep 2010 21:38:20 +0000 (14:38 -0700)]
am
5fdacb8a: am
ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '
5fdacb8a2818136218afdea4308ad1b10049a201'
* commit '
5fdacb8a2818136218afdea4308ad1b10049a201':
People holding partial wake locks now get blamed for CPU usage.
Jake Hamby [Wed, 8 Sep 2010 21:38:15 +0000 (14:38 -0700)]
am
e7578344: am
5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '
e75783440a55fb0a5ef75066be94a11898f652f0'
* commit '
e75783440a55fb0a5ef75066be94a11898f652f0':
Allow incoming SMS until internal storage is almost full.
Jeff Brown [Wed, 8 Sep 2010 21:38:09 +0000 (14:38 -0700)]
Dianne Hackborn [Wed, 8 Sep 2010 21:34:41 +0000 (14:34 -0700)]
am
ee455f5a: Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Merge commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50' into gingerbread-plus-aosp
* commit '
ee455f5a9572bc0d23c3328f6c22da91dc109a50':
People holding partial wake locks now get blamed for CPU usage.
Jake Hamby [Wed, 8 Sep 2010 21:34:31 +0000 (14:34 -0700)]
am
5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp
* commit '
5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
Allow incoming SMS until internal storage is almost full.
Jeff Brown [Wed, 8 Sep 2010 21:34:26 +0000 (14:34 -0700)]
am
b21fb104: Fix key repeat delay.
Merge commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1' into gingerbread-plus-aosp
* commit '
b21fb104cc95fe7e5daf3b3626241e525c39a3f1':
Fix key repeat delay.
Joe Onorato [Wed, 8 Sep 2010 21:30:05 +0000 (14:30 -0700)]
Merge "move recent apps around, attempting to make it not crash."
Dianne Hackborn [Wed, 8 Sep 2010 21:15:35 +0000 (14:15 -0700)]
Merge "People holding partial wake locks now get blamed for CPU usage." into gingerbread
Jeff Brown [Wed, 8 Sep 2010 21:03:10 +0000 (14:03 -0700)]
am
6bb72458: (-s ours) am
de2f3340: Update current.xml for touch filtering feature.
Merge commit '
6bb72458f934f00fdfee75323a7919a9f10eba03'
* commit '
6bb72458f934f00fdfee75323a7919a9f10eba03':
Update current.xml for touch filtering feature.
Jeff Brown [Wed, 8 Sep 2010 20:02:55 +0000 (13:02 -0700)]
resolved conflicts for merge of
a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
Jake Hamby [Wed, 8 Sep 2010 19:49:27 +0000 (12:49 -0700)]
Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Jeff Brown [Wed, 8 Sep 2010 19:29:49 +0000 (12:29 -0700)]
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.
Jeff Brown [Tue, 7 Sep 2010 17:44:57 +0000 (10:44 -0700)]
Fix key repeat delay.
Change-Id: I6216e082324ee29bf50e37acc673350ca5417c4d
Joe Onorato [Wed, 8 Sep 2010 19:11:55 +0000 (12:11 -0700)]
Merge "Fix build due to stubs errors on filename changes"
Jeff Brown [Wed, 8 Sep 2010 18:55:24 +0000 (11:55 -0700)]
am
85a31767: Add support for secure views.
Merge commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp
* commit '
85a3176704b5bfbeece9bd928369fbb76eec7dc6':
Add support for secure views.
Jeff Brown [Thu, 2 Sep 2010 00:01:00 +0000 (17:01 -0700)]
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
Jack Veenstra [Wed, 8 Sep 2010 18:44:05 +0000 (11:44 -0700)]
Merge "Add support for giving arrays of ints and longs to the "am" command."
Jean-Baptiste Queru [Wed, 8 Sep 2010 18:07:30 +0000 (11:07 -0700)]
am
6ffee9bb: Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Merge commit '
6ffee9bbba53700d33456261b986ac8a3f333b9e'
* commit '
6ffee9bbba53700d33456261b986ac8a3f333b9e':
Revert "resolve conflicts"
Erik [Wed, 8 Sep 2010 18:04:41 +0000 (11:04 -0700)]
am
c4f628a1: am
c0b4f6d3: Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Merge commit '
c4f628a1ba359926cf53ed7652d9abba6ea29123'
* commit '
c4f628a1ba359926cf53ed7652d9abba6ea29123':
Adds a time zone parameter to formatDateRange
Jean-Baptiste Queru [Wed, 8 Sep 2010 18:03:22 +0000 (11:03 -0700)]
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp
Erik [Wed, 8 Sep 2010 18:01:27 +0000 (11:01 -0700)]
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
Erik [Wed, 8 Sep 2010 17:58:12 +0000 (10:58 -0700)]
Merge "Adds a time zone parameter to formatDateRange" into gingerbread
Mike Lockwood [Wed, 8 Sep 2010 17:52:44 +0000 (10:52 -0700)]
Merge changes Ib18b93bf,I4c86d7e3
* changes:
MTP: Allow transfering arbitrary file types.
Rename the media database's "objects" table to "files"
Gilles Debunne [Wed, 8 Sep 2010 17:38:45 +0000 (10:38 -0700)]
am
d4fd86d1: (-s ours) am
468394fc: Text Selection: smart word detection. DO NOT MERGE.
Merge commit '
d4fd86d19a070a355255b51742075fbf8e69fa4a'
* commit '
d4fd86d19a070a355255b51742075fbf8e69fa4a':
Text Selection: smart word detection. DO NOT MERGE.
Elliott Hughes [Wed, 8 Sep 2010 17:38:41 +0000 (10:38 -0700)]
am
664c48e9: am
4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '
664c48e991a70d07646d54125e97f579f3a33be4'
* commit '
664c48e991a70d07646d54125e97f579f3a33be4':
Remove dead code: NIOBuffer.
Chung-yih Wang [Wed, 8 Sep 2010 17:38:35 +0000 (10:38 -0700)]
am
4f24aed2: am
66907078: Merge "Fix the dialing from contact for internet address." into gingerbread
Merge commit '
4f24aed2a13d9ba89e2402894353176e19571e6e'
* commit '
4f24aed2a13d9ba89e2402894353176e19571e6e':
Fix the dialing from contact for internet address.
Chung-yih Wang [Wed, 8 Sep 2010 17:35:11 +0000 (10:35 -0700)]
am
576b492c: am
5de1d36d: Log outbound proxy address if exists for debugging.
Merge commit '
576b492c15a079c9d3d818f3f7fadc4408c2908a'
* commit '
576b492c15a079c9d3d818f3f7fadc4408c2908a':
Log outbound proxy address if exists for debugging.
Gilles Debunne [Wed, 8 Sep 2010 17:32:42 +0000 (10:32 -0700)]
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.
Elliott Hughes [Wed, 8 Sep 2010 17:32:38 +0000 (10:32 -0700)]
am
4c7d3f28: Merge "Remove dead code: NIOBuffer." into gingerbread
Merge commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f' into gingerbread-plus-aosp
* commit '
4c7d3f28898f4e0d8e9f54537fb92948e650df7f':
Remove dead code: NIOBuffer.
Chung-yih Wang [Wed, 8 Sep 2010 17:32:13 +0000 (10:32 -0700)]
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.
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:28:41 +0000 (10:28 -0700)]
am
84f992a2: resolve conflicts
Merge commit '
84f992a249491b9f755e879bf096baac3f9472f5'
* commit '
84f992a249491b9f755e879bf096baac3f9472f5':
Adding Download Manager Integration, stress, and hosts-based tests.
Chung-yih Wang [Wed, 8 Sep 2010 17:28:09 +0000 (10:28 -0700)]
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.
Chet Haase [Wed, 8 Sep 2010 17:25:19 +0000 (10:25 -0700)]
Merge "Rename several animation classes"
Makoto Onuki [Wed, 8 Sep 2010 17:14:01 +0000 (10:14 -0700)]
Merge "Added "Memory observability" to javadoc."
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:02:35 +0000 (10:02 -0700)]
resolve conflicts
Change-Id: I87f854430f7083cd2f2e28b4ec4a7112ef6fe4f1
Gilles Debunne [Wed, 8 Sep 2010 17:01:46 +0000 (10:01 -0700)]
Merge "Made text selection work in ExtractEditText. Manual merge of Gingerbread 64947."
Lorenzo Colitti [Wed, 8 Sep 2010 16:30:45 +0000 (09:30 -0700)]
Merge "Framework changes for IPv6 / IPv4v6 data calls."
Elliott Hughes [Wed, 8 Sep 2010 16:30:41 +0000 (09:30 -0700)]
Merge "Remove dead code: NIOBuffer." into gingerbread
Mike Lockwood [Wed, 8 Sep 2010 13:52:51 +0000 (06:52 -0700)]
Merge "Fix Intent.ACTION_REBOOT"
Chung-yih Wang [Wed, 8 Sep 2010 10:32:01 +0000 (03:32 -0700)]
Merge "Fix the dialing from contact for internet address." into gingerbread
Steve Block [Wed, 8 Sep 2010 10:20:12 +0000 (03:20 -0700)]
Merge "Update DumpRenderTree2 to reflect removal of WEBKIT_MERGE_REVISION"
Ying Wang [Wed, 8 Sep 2010 05:28:20 +0000 (22:28 -0700)]
Merge "Reflected class name and bc file name changes."
Wei-Ta Chen [Wed, 8 Sep 2010 05:10:58 +0000 (22:10 -0700)]
am
8fc6f8b2: am
1b214be9: Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Merge commit '
8fc6f8b2152564cab6ede025644f9bc3ee61ce16'
* commit '
8fc6f8b2152564cab6ede025644f9bc3ee61ce16':
Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."
Gilles Debunne [Wed, 8 Sep 2010 05:10:45 +0000 (22:10 -0700)]
am
e0974284: am
d6e56895: update-api step missing from 64963.
Merge commit '
e0974284a8983524c8719a47e57395f0030c3128'
* commit '
e0974284a8983524c8719a47e57395f0030c3128':
update-api step missing from 64963.
Brad Fitzpatrick [Wed, 8 Sep 2010 05:10:41 +0000 (22:10 -0700)]
am
b1657b2b: resolved conflicts for merge of
64591009 to gingerbread-plus-aosp
Merge commit '
b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d'
* commit '
b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d':
Fix a race between requesting/loading/writing SharedPreferences.
Wei-Ta Chen [Wed, 8 Sep 2010 04:48:48 +0000 (21:48 -0700)]
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."
Gilles Debunne [Wed, 8 Sep 2010 04:48:39 +0000 (21:48 -0700)]
am
d6e56895: update-api step missing from 64963.
Merge commit '
d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537' into gingerbread-plus-aosp
* commit '
d6e56895f647d3c6ea33cea15fdb7b1e9ff3f537':
update-api step missing from 64963.
Brad Fitzpatrick [Wed, 8 Sep 2010 04:41:09 +0000 (21:41 -0700)]
resolved conflicts for merge of
64591009 to gingerbread-plus-aosp
Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e
Adam Powell [Wed, 8 Sep 2010 04:04:54 +0000 (21:04 -0700)]
Merge "Reworking the ActionBar tab API"
Guang Zhu [Wed, 8 Sep 2010 04:00:32 +0000 (21:00 -0700)]
Merge "temporarily skip simple-cross-origin-progress-events.html for now"
Neal Nguyen [Wed, 8 Sep 2010 03:55:22 +0000 (20:55 -0700)]
Merge "Adding Download Manager Integration, stress, and hosts-based tests." into gingerbread
Wei-Ta Chen [Wed, 8 Sep 2010 03:36:13 +0000 (20:36 -0700)]
Merge "Revert "Rename LargeBitmap to BitmapRegionDecoder for having a better API."" into gingerbread
Brad Fitzpatrick [Wed, 8 Sep 2010 03:06:26 +0000 (20:06 -0700)]
Merge "Fix a race between requesting/loading/writing SharedPreferences." into gingerbread
Hung-ying Tyan [Wed, 8 Sep 2010 02:43:33 +0000 (19:43 -0700)]
am
f870ee81: am
d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit '
f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'
* commit '
f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Kenny Root [Wed, 8 Sep 2010 02:41:00 +0000 (19:41 -0700)]
am
2a08e2a9: am
a19ef306: Revert "Free created FileMap when uncompressing files"
Merge commit '
2a08e2a9f881d06a03e36367585137e05706f592'
* commit '
2a08e2a9f881d06a03e36367585137e05706f592':
Revert "Free created FileMap when uncompressing files"
Hung-ying Tyan [Wed, 8 Sep 2010 02:40:40 +0000 (19:40 -0700)]
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.
Hung-ying Tyan [Wed, 8 Sep 2010 02:37:33 +0000 (19:37 -0700)]
Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Kenny Root [Wed, 8 Sep 2010 02:35:47 +0000 (19:35 -0700)]
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"
Kenny Root [Wed, 8 Sep 2010 02:30:22 +0000 (19:30 -0700)]
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.
Gilles Debunne [Wed, 8 Sep 2010 02:05:18 +0000 (19:05 -0700)]
am
cf86bc1d: am
883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '
cf86bc1d92128455c06ed8b0a338e7b3145d11a7'
* commit '
cf86bc1d92128455c06ed8b0a338e7b3145d11a7':
Hide mCursorController field in ArrowKeyMovementMethod.
Gilles Debunne [Wed, 8 Sep 2010 02:05:11 +0000 (19:05 -0700)]
am
2ae3718b: (-s ours) am
dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE
Merge commit '
2ae3718b448cdc5e94b4686795301a01f54640e4'
* commit '
2ae3718b448cdc5e94b4686795301a01f54640e4':
Made text selection work in ExtractEditText. DO NOT MERGE
Gilles Debunne [Wed, 8 Sep 2010 01:59:22 +0000 (18:59 -0700)]
am
883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Merge commit '
883bbb72284736b5601f9e96d1116969c51b75de' into gingerbread-plus-aosp
* commit '
883bbb72284736b5601f9e96d1116969c51b75de':
Hide mCursorController field in ArrowKeyMovementMethod.
Gilles Debunne [Wed, 8 Sep 2010 01:59:10 +0000 (18:59 -0700)]
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
Gilles Debunne [Wed, 8 Sep 2010 01:53:55 +0000 (18:53 -0700)]
Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread
Dmitry Shmidt [Wed, 8 Sep 2010 01:52:40 +0000 (18:52 -0700)]
am
59a5d2d5: (-s ours) am
d0f74ae0: Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Merge commit '
59a5d2d5772f41578c72f48df08c0af918b6519c'
* commit '
59a5d2d5772f41578c72f48df08c0af918b6519c':
Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE
Wei-Ta Chen [Wed, 8 Sep 2010 01:52:21 +0000 (18:52 -0700)]
am
a295a390: am
b356f8ac: Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Merge commit '
a295a3908befeb9dd30203c612d95411d68492ed'
* commit '
a295a3908befeb9dd30203c612d95411d68492ed':
Rename LargeBitmap to BitmapRegionDecoder for having a better API.
Dianne Hackborn [Wed, 8 Sep 2010 01:52:06 +0000 (18:52 -0700)]
am
a1205f07: am
2d3739d4: Merge "Modify native ALooper to take an explicit ident." into gingerbread
Merge commit '
a1205f07a6f0c745e8f42f16fe38c06af04143c7'
* commit '
a1205f07a6f0c745e8f42f16fe38c06af04143c7':
Modify native ALooper to take an explicit ident.
Kenny Root [Wed, 8 Sep 2010 01:51:53 +0000 (18:51 -0700)]
am
000ef46f: am
25429378: Merge "Allow installd to handle large partitions" into gingerbread
Merge commit '
000ef46f5b0f84d08342711b00e8de560ea504af'
* commit '
000ef46f5b0f84d08342711b00e8de560ea504af':
Allow installd to handle large partitions
Elliott Hughes [Wed, 8 Sep 2010 01:51:16 +0000 (18:51 -0700)]
Ying Wang [Wed, 8 Sep 2010 01:39:03 +0000 (18:39 -0700)]
Merge commit '
d348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge
Conflicts:
core/res/res/values/public.xml
Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
Dmitry Shmidt [Wed, 8 Sep 2010 00:33:55 +0000 (17:33 -0700)]
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
Dmitry Shmidt [Wed, 8 Sep 2010 00:29:45 +0000 (17:29 -0700)]
Merge "Rename SETSUSPEND to SETSUSPENDOPT DO NOT MERGE" into gingerbread
Romain Guy [Wed, 8 Sep 2010 00:17:12 +0000 (17:17 -0700)]
Merge "Correctly set the viewport on window resize."
Wei-Ta Chen [Wed, 8 Sep 2010 00:07:12 +0000 (17:07 -0700)]
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.
Wei-Ta Chen [Wed, 8 Sep 2010 00:01:57 +0000 (17:01 -0700)]
Merge "Rename LargeBitmap to BitmapRegionDecoder for having a better API." into gingerbread
Dianne Hackborn [Tue, 7 Sep 2010 23:38:45 +0000 (16:38 -0700)]
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.
Dianne Hackborn [Tue, 7 Sep 2010 23:32:48 +0000 (16:32 -0700)]
Merge "Modify native ALooper to take an explicit ident." into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 22:59:07 +0000 (15:59 -0700)]
Merge "Add getApplicationContext to the mock implementation."
Dianne Hackborn [Tue, 7 Sep 2010 22:28:30 +0000 (15:28 -0700)]
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
Kenny Root [Tue, 7 Sep 2010 22:42:02 +0000 (15:42 -0700)]
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
Kenny Root [Tue, 7 Sep 2010 22:38:31 +0000 (15:38 -0700)]
Merge "Allow installd to handle large partitions" into gingerbread
Makoto Onuki [Tue, 7 Sep 2010 22:16:44 +0000 (15:16 -0700)]
am
3f6e4d56: am
1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
Merge commit '
3f6e4d56bba393ac556a672202e00bc417784ce8'
* commit '
3f6e4d56bba393ac556a672202e00bc417784ce8':
Don't fall through from TOKEN_EMAIL_LOOKUP
Dianne Hackborn [Tue, 7 Sep 2010 22:16:38 +0000 (15:16 -0700)]
am
75f0024c: am
6e86915e: Merge "Fixes to battery stats debug output." into gingerbread
Merge commit '
75f0024cf40eadb2cdaa6ae53409c515b68f21c1'
* commit '
75f0024cf40eadb2cdaa6ae53409c515b68f21c1':
Fixes to battery stats debug output.
Dianne Hackborn [Tue, 7 Sep 2010 21:48:28 +0000 (14:48 -0700)]
Dianne Hackborn [Tue, 7 Sep 2010 21:47:51 +0000 (14:47 -0700)]
am
b8bcfed5: am
f703b77c: Merge "Add system property to turn off scheduling groups." into gingerbread
Merge commit '
b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4'
* commit '
b8bcfed5524a37ee51e3f1129f1df91bc4a59cb4':
Add system property to turn off scheduling groups.
Elliott Hughes [Tue, 7 Sep 2010 21:46:15 +0000 (14:46 -0700)]
am
45cda90b: Merge "Be brief." into gingerbread
Merge commit '
45cda90bdc178e253049c7067c78bf4b1204ba82' into gingerbread-plus-aosp
* commit '
45cda90bdc178e253049c7067c78bf4b1204ba82':
Be brief.
OSDN Git Service
