Steve Howard
825bdff3b8
resolved conflicts for merge of 538c3fa3 to master
...
Change-Id: I9190ca078ffd8b51515e3d53ac5753c05110c014
2010-09-30 14:41:59 -07:00
Kenny Root
aff30c9b0d
am 99f8c5ee: Merge "Fix location of gdbserver upon installation" into gingerbread
...
Merge commit '99f8c5ee621d78a24583a10e459ba40aab511a17' into gingerbread-plus-aosp
* commit '99f8c5ee621d78a24583a10e459ba40aab511a17':
Fix location of gdbserver upon installation
2010-09-30 14:30:14 -07:00
Kenny Root
99f8c5ee62
Merge "Fix location of gdbserver upon installation" into gingerbread
2010-09-30 14:27:15 -07:00
Kenny Root
e6da118ebf
Fix location of gdbserver upon installation
...
Change-Id: Ie97f10456e5639e008abf4792a01b966b97721e7
2010-09-30 14:13:59 -07:00
Wu-cheng Li
1eb98bdb44
am 6bbc2f15: am 2fb818ca: Fix the javadoc of Parameters.setRotation.
...
Merge commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a'
* commit '6bbc2f1562ddc1be65aafcce63896f5899596c2a':
Fix the javadoc of Parameters.setRotation.
2010-09-30 13:38:15 -07:00
Adam Powell
64e2b71893
resolved conflicts for merge of 6e9a021e to master
...
Change-Id: I5ea823b752e78cb9d2ef7ccec68addbaa9ca66e9
2010-09-30 13:09:43 -07:00
Jeff Brown
3cfc508f4e
am 76d55a34: am 5068ad8d: Revert orientation change.
...
Merge commit '76d55a3447954db97b7172d068813d02e89ba9ca'
* commit '76d55a3447954db97b7172d068813d02e89ba9ca':
Revert orientation change.
2010-09-30 12:02:31 -07:00
Jeff Brown
36c956d78b
am b8182a38: am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
...
Merge commit 'b8182a382df3efaf18c9810dd7c517b2601edadb'
* commit 'b8182a382df3efaf18c9810dd7c517b2601edadb':
PointerLocationView: Display orientation correctly.
2010-09-30 12:02:17 -07:00
Jeff Brown
20e987bfc3
Add MotionEvent Matrix transformations.
...
Fixed issued in ViewGroup's transformation of MotionEvents to ensure
that the entire historical trace is transformed, not just the current
pointer.
Simplified the code in ViewGroup for splitting events across Views.
The new code also handles the case where some pointers are dispatched
to the ViewGroup in addition to its children whereas the previous
code would drop some pointers on the floor.
Change-Id: I56ac31903e1de8a9c376d9c935b7217b0c42d93e
2010-09-30 11:52:48 -07:00
Paul Westbrook
5dcaf7b0b9
am fcf1948a: Moved Rfc822 validator test
...
Merge commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7' into gingerbread-plus-aosp
* commit 'fcf1948aeb0b548d1f89890d58baefd008880cb7':
Moved Rfc822 validator test
2010-09-30 11:45:05 -07:00
Steve Howard
538c3fa35f
am cdcc0a65: Merge "Have download manager give more details when downloads are paused" into gingerbread
...
Merge commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada' into gingerbread-plus-aosp
* commit 'cdcc0a65fae7e649f0f07e396dbe0dd59ceffada':
Have download manager give more details when downloads are paused
2010-09-30 11:42:16 -07:00
Paul Westbrook
fcf1948aeb
Moved Rfc822 validator test
...
Moved rfc822 validator test to framework/ex, as this is where
the code lives
Change-Id: Ia12e67364df9c8f9351dea423d769454a5d4e58d
2010-09-30 11:32:42 -07:00
Doug Zongker
ca2e0293f2
am ab9f5082: am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3'
* commit 'ab9f508292f9a1eb54bf97bdd1566bdf8dd43fb3':
don't delete /cache/recovery/last_log on boot
2010-09-30 11:25:26 -07:00
Jaikumar Ganesh
659d3d566b
am c10207b6: am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
...
Merge commit 'c10207b6bfcfe09636dd2035b4237f1001008a48'
* commit 'c10207b6bfcfe09636dd2035b4237f1001008a48':
Update local cache before sending intent.
2010-09-30 11:25:18 -07:00
Steve Howard
99047d7b65
Avoid NPE when viewing failed legacy download with no local path
...
Change-Id: I3e9d349959543f42afed67de9f6d299c268ab7ac
2010-09-30 11:14:09 -07:00
Steve Howard
cdcc0a65fa
Merge "Have download manager give more details when downloads are paused" into gingerbread
2010-09-30 11:11:16 -07:00
Wu-cheng Li
6bbc2f1562
am 2fb818ca: Fix the javadoc of Parameters.setRotation.
...
Merge commit '2fb818ca7dd53d00646854a2473f1a69be43067c' into gingerbread-plus-aosp
* commit '2fb818ca7dd53d00646854a2473f1a69be43067c':
Fix the javadoc of Parameters.setRotation.
2010-09-30 11:07:23 -07:00
Eric Fischer
8b75965525
am 97708b19: am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '97708b19c564294182558d757a871abc892d6975'
* commit '97708b19c564294182558d757a871abc892d6975':
Split strings with SD card references into variations.
2010-09-30 11:00:01 -07:00
Wu-cheng Li
2fb818ca7d
Fix the javadoc of Parameters.setRotation.
...
setRotation needs to consider the orientation of cameras.
Change-Id: I3ef23dc088647dacdddbb83e3f303c16b9251185
2010-09-30 10:49:43 -07:00
Adam Powell
6e9a021e96
am bc87ada1: Merge "Fix text anchors" into gingerbread
...
Merge commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120' into gingerbread-plus-aosp
* commit 'bc87ada10de34c2d7b1301af86d94ed7c4801120':
Fix text anchors
2010-09-30 10:10:34 -07:00
Jeff Brown
76d55a3447
am 5068ad8d: Revert orientation change.
...
Merge commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9' into gingerbread-plus-aosp
* commit '5068ad8d2396d6d7bfbdb1c2c3fe57104744f1f9':
Revert orientation change.
2010-09-30 10:10:20 -07:00
Jeff Brown
b8182a382d
am 93e3296f: Merge "PointerLocationView: Display orientation correctly." into gingerbread
...
Merge commit '93e3296f946bf54e0f8172c9d26355d9a65c878f' into gingerbread-plus-aosp
* commit '93e3296f946bf54e0f8172c9d26355d9a65c878f':
PointerLocationView: Display orientation correctly.
2010-09-30 10:10:09 -07:00
Gilles Debunne
8064dd2265
am 71e24862: Merge "New assets for status bar data_edge and overscroll" into gingerbread
...
Merge commit '71e2486209856d33d027389be2bd4924a03c4f86' into gingerbread-plus-aosp
* commit '71e2486209856d33d027389be2bd4924a03c4f86':
New assets for status bar data_edge and overscroll
2010-09-30 10:08:38 -07:00
Owen Lin
e224fabb2c
Fix segfault when tring to throw IOException.
...
Change-Id: I530cc4409ba4ca17cec933afad077c5f60ba554f
2010-09-30 16:56:03 +08:00
Owen Lin
a9164cbb30
Merge "Fix a initialization bug in BitmapRegionDecoder."
2010-09-29 22:57:08 -07:00
Adam Powell
bc87ada10d
Merge "Fix text anchors" into gingerbread
2010-09-29 21:05:12 -07:00
Adam Powell
ba0a2c383f
Fix text anchors
...
Change-Id: Iddd5434a1dbeb1adc2143db73ed27df6b575319e
2010-09-29 21:02:19 -07:00
Jeff Brown
5068ad8d23
Revert orientation change.
...
Change-Id: I1a6d13be118533171b9a75025dcf7985dd7e12b5
2010-09-29 20:14:56 -07:00
Jeff Brown
93e3296f94
Merge "PointerLocationView: Display orientation correctly." into gingerbread
2010-09-29 19:08:02 -07:00
Jeff Brown
707a57aa26
PointerLocationView: Display orientation correctly.
...
Canvas rotations are counterclockwise, orientation is clockwise,
so we need to mind the sign of the rotation.
Change-Id: I2a8b60599bd26e9dc3ced2e13942f846461333df
2010-09-29 18:41:11 -07:00
Winson Chung
4e2affec16
Merge "Fixing issue where notifyDataSetChanged was not properly being called while not loading items."
2010-09-29 18:03:07 -07:00
Winson Chung
6364f2bbe5
Fixing issue where notifyDataSetChanged was not properly being called while not loading items.
...
Change-Id: I46bb30a5a95576891f11873b214f5c760f5d1757
2010-09-29 18:01:15 -07:00
Steve Howard
3e8c1d3a46
Have download manager give more details when downloads are paused
...
This change introduces more detailed reporting of why downloads are paused in
the download manager.
First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED. I've eliminated some dead code there as well to ease the
change.
Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED. It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.
Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
2010-09-29 17:34:40 -07:00
Kenny Root
ea7ee3f4d3
am 8bd545ab: am 212d81a0: Merge "Move all the permissions check up for unmount" into gingerbread
...
Merge commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c'
* commit '8bd545ab4f7e75634c970b50ed15c20858d6ac0c':
Move all the permissions check up for unmount
2010-09-29 17:17:22 -07:00
Gilles Debunne
03b58063de
New assets for status bar data_edge and overscroll
...
Change-Id: I32b8e036fc54a912719df660db3063045d8d7c93
2010-09-29 17:02:50 -07:00
Eric Fischer
2c3eba4c08
Import revised translations. DO NOT MERGE
...
Change-Id: Iaa642982ed369b45f0923f919167ccb2e27b72c4
2010-09-29 14:29:00 -07:00
Doug Zongker
ab9f508292
am 981dec69: Merge "don\'t delete /cache/recovery/last_log on boot" into gingerbread
...
Merge commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4' into gingerbread-plus-aosp
* commit '981dec695f83eb51935fcf480ecbd76ae3f7d6c4':
don't delete /cache/recovery/last_log on boot
2010-09-29 13:43:28 -07:00
Doug Zongker
981dec695f
Merge "don't delete /cache/recovery/last_log on boot" into gingerbread
2010-09-29 13:41:00 -07:00
Romain Guy
e17c054d34
Merge "Add display lists caching."
2010-09-29 13:37:37 -07:00
Romain Guy
b051e895cc
Add display lists caching.
...
Change-Id: Iac3a248a81ed8cb076a83ef9d186b8ebba685b4c
2010-09-29 13:29:04 -07:00
Jaikumar Ganesh
c10207b6bf
am a5c742bf: Merge "Update local cache before sending intent." into gingerbread
...
Merge commit 'a5c742bfd08df55849418cd1c77065ac54d83502' into gingerbread-plus-aosp
* commit 'a5c742bfd08df55849418cd1c77065ac54d83502':
Update local cache before sending intent.
2010-09-29 13:27:38 -07:00
Jaikumar Ganesh
a5c742bfd0
Merge "Update local cache before sending intent." into gingerbread
2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3
don't delete /cache/recovery/last_log on boot
...
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
2010-09-29 13:22:49 -07:00
Nick Pelly
4715bd91f5
resolved conflicts for merge of f4c3b7e9 to master
...
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
2010-09-29 12:20:51 -07:00
Eric Fischer
97708b19c5
am 5f0c8fe6: Merge "Split strings with SD card references into variations." into gingerbread
...
Merge commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0' into gingerbread-plus-aosp
* commit '5f0c8fe6516ab2327f93f1c038d8854dbcbe7ce0':
Split strings with SD card references into variations.
2010-09-29 12:17:28 -07:00
Eric Fischer
d77782ed63
Split strings with SD card references into variations.
...
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
2010-09-29 12:09:04 -07:00
Steve Block
9d59429eaa
Merge "Update WebView useragent string for merge to WebKit r67908"
2010-09-29 10:42:30 -07:00
Roy West
b4a28f2426
am d146c233: Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
...
Merge commit 'd146c233c570af3ee31d2e6ac44082571026d619' into gingerbread-plus-aosp
* commit 'd146c233c570af3ee31d2e6ac44082571026d619':
Partial fix to bug 2992589: Edit dev admin strings.
2010-09-29 10:40:06 -07:00
Roy West
d146c233c5
Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread
2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149
Update local cache before sending intent.
...
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
2010-09-29 10:31:02 -07:00