Shimeng (Simon) Wang
66064914fc
Keep min/max zoom scale in proportion when zoom density changes.
...
issue: 3341610
Change-Id: Ibf87ab499e28fddab81d4e354ec7d88f5eb86261
2011-01-20 17:45:34 -08:00
Adam Cohen
ef17dd497e
Cleaning up some StackView bad behavior
...
-> Issue: 3363564, 3320865
Change-Id: I32215478006a689f543532af4ce2267ccbb7fa56
2011-01-20 17:36:27 -08:00
Brad Fitzpatrick
9e9d886b27
am 7204528e: am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb
...
* commit '7204528e71145e34bedd6cfb13110eb872d8a968':
Fixes for StrictMode instance count checking.
2011-01-20 17:26:29 -08:00
Dianne Hackborn
4789b873a6
am 8a545b9e: am e69e0fde: Merge "Fix issue #3374356 : Buttons sometimes don\'t highlight" into honeycomb
...
* commit '8a545b9e3f67fedcb18f3ab9de00e8003a7fcd51':
Fix issue #3374356 : Buttons sometimes don't highlight
2011-01-20 17:26:21 -08:00
Justin Ho
195ba939b3
am f0a1b497: am 46833c45: Merge "Updated sysbar lights out assets and recents bg protect tile" into honeycomb
...
* commit 'f0a1b49765656d6cd40731a4e489da9875125245':
Updated sysbar lights out assets and recents bg protect tile
2011-01-20 17:26:16 -08:00
Adam Powell
1bc9e6cbb1
am 8bbec794: am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb
...
* commit '8bbec794473f802d4d61613f77bc69a582e3fcc0':
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
2011-01-20 17:25:55 -08:00
Christopher Tate
3e09d42b2b
am 9424bfa9: am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events
...
* commit '9424bfa91dd5686187d0e9611c17851dae580f52':
Include the local state obj in ACTION_DRAG_STARTED events
2011-01-20 17:25:50 -08:00
Daniel Sandler
e9caa93c41
am 25e59dae: am a7cb63a1: Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb
...
* commit '25e59dae36b3b16733439bcbec64f655885039ed':
Remove inappropriate triangle icons from quick settings panel.
2011-01-20 17:25:45 -08:00
Kenny Root
d002c44eab
am cb95ebce: am 6af08a47: Merge "Don\'t pay attention to string block on @null" into honeycomb
...
* commit 'cb95ebcecfaccbfdeb1ab34559869c95792596ac':
Don't pay attention to string block on @null
2011-01-20 17:25:39 -08:00
Trevor Johns
a736c401c4
am fa7469ca: am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb
...
* commit 'fa7469cae8511bb2dc0e40dcb548f1b5957be52c':
Fixing bugs in HelloWebView tutorial on developer.android.com.
2011-01-20 17:25:33 -08:00
Joe Onorato
909ac9edc4
am 2d821b8c: am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb
...
* commit '2d821b8cb8a3c11f2cde662d48890e81430b7f8d':
Don't log the full stack trace when we can't load a resource.
2011-01-20 17:25:25 -08:00
Mathias Agopian
b315616495
am 6f1ee600: am 35e4a497: Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb
...
* commit '6f1ee60033ba49365777776b05ef18d6d2e9cc50':
fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()
2011-01-20 17:25:20 -08:00
Mathias Agopian
ea870e0af4
am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycomb
...
* commit '612d7f3c092ec2c4a2ae44cb09d6dfb4e525a659':
clean-up unneeded code
2011-01-20 17:25:14 -08:00
Stephen Hines
35d5fb744d
am ec5179ac: am 2e0f0bb3: Merge "Remove unnecessary library functions." into honeycomb
...
* commit 'ec5179aceca4b92ea4136f0c337ba6cb909c56c7':
Remove unnecessary library functions.
2011-01-20 17:25:07 -08:00
Wink Saville
6f26efa6a0
am ae4fe1f7: (-s ours) am 18fcb8d8: Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb
...
* commit 'ae4fe1f7ab670409b5277967dea67ce8e81c9c41':
Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
2011-01-20 17:25:01 -08:00
Andreas Huber
ec0c94b7d7
am c4f82e33: Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
...
* commit 'c4f82e3387429ae94e4874b7dc1649b3c643b505':
Implement missing pause/resume support for NuPlayer.
2011-01-20 17:14:59 -08:00
Scott Main
437bf22d0f
am cfaa9c15: Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
...
* commit 'cfaa9c152cf7fbdf13b41876422fdfe9bffa3c2a':
docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag
2011-01-20 17:14:55 -08:00
Dianne Hackborn
d79b8b173c
am 27044f1d: Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
...
* commit '27044f1d4c5765388a745527b220a3a574c4f834':
Fix issue #3352125 : Crash after clearing search query
2011-01-20 17:14:41 -08:00
Santosh Madhava
9d5ca4a14c
Fix for issue 3370052 : Export progress percentage is incorrect
...
Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
2011-01-20 17:10:40 -08:00
Brad Fitzpatrick
7204528e71
am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb
...
* commit '9358bd39dc8829ef8413294da70d44cd928ca878':
Fixes for StrictMode instance count checking.
2011-01-20 17:07:41 -08:00
Dianne Hackborn
8a545b9e3f
am e69e0fde: Merge "Fix issue #3374356 : Buttons sometimes don\'t highlight" into honeycomb
...
* commit 'e69e0fde6cf0e6302d5a05363a3db7a9c555e9dc':
Fix issue #3374356 : Buttons sometimes don't highlight
2011-01-20 17:07:31 -08:00
Justin Ho
f0a1b49765
am 46833c45: Merge "Updated sysbar lights out assets and recents bg protect tile" into honeycomb
...
* commit '46833c45bf85ee77709fec817411fabd582ba7df':
Updated sysbar lights out assets and recents bg protect tile
2011-01-20 17:07:20 -08:00
Adam Powell
8bbec79447
am 9c91c7e2: Merge "Fix bug 3362375 - API REVIEW: remove unused public \'up\' id" into honeycomb
...
* commit '9c91c7e27fbfff5abc34e19779a9477239ab9b10':
Fix bug 3362375 - API REVIEW: remove unused public 'up' id
2011-01-20 17:06:35 -08:00
Christopher Tate
9424bfa91d
am 7fb8b565: Include the local state obj in ACTION_DRAG_STARTED events
...
* commit '7fb8b565f9cd2ec6a63ff4d8a89f98f68a1a138c':
Include the local state obj in ACTION_DRAG_STARTED events
2011-01-20 17:05:57 -08:00
Andreas Huber
c4f82e3387
Merge "Implement missing pause/resume support for NuPlayer." into honeycomb
2011-01-20 17:05:48 -08:00
Daniel Sandler
25e59dae36
am a7cb63a1: Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb
...
* commit 'a7cb63a15319c5a4b59f67e66c93b5b9616475d4':
Remove inappropriate triangle icons from quick settings panel.
2011-01-20 17:05:28 -08:00
Kenny Root
cb95ebcecf
am 6af08a47: Merge "Don\'t pay attention to string block on @null" into honeycomb
...
* commit '6af08a47d02ef75e18d226b93a0b553396cb6842':
Don't pay attention to string block on @null
2011-01-20 17:05:18 -08:00
Scott Main
cfaa9c152c
Merge "docs: small javadoc, but also make the existing getProfileProxy docs visible... had wrong comment tag" into honeycomb
2011-01-20 17:04:48 -08:00
Trevor Johns
fa7469cae8
am 2ca4d8b7: Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb
...
* commit '2ca4d8b7b97f20c8ad6897fc8c0c95616c0e80c6':
Fixing bugs in HelloWebView tutorial on developer.android.com.
2011-01-20 17:04:40 -08:00
Joe Onorato
2d821b8cb8
am 913d04aa: Merge "Don\'t log the full stack trace when we can\'t load a resource." into honeycomb
...
* commit '913d04aa3b187beffd7691acb1e61a8b09810bbe':
Don't log the full stack trace when we can't load a resource.
2011-01-20 17:04:13 -08:00
Mathias Agopian
6f1ee60033
am 35e4a497: Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb
...
* commit '35e4a497f4463adb78d35a57f22847bec0eaab1a':
fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()
2011-01-20 17:03:55 -08:00
Mathias Agopian
612d7f3c09
am a423d868: Merge "clean-up unneeded code" into honeycomb
...
* commit 'a423d868009b9961597365ce7f190aef23f4b1cc':
clean-up unneeded code
2011-01-20 17:03:46 -08:00
Stephen Hines
ec5179acec
am 2e0f0bb3: Merge "Remove unnecessary library functions." into honeycomb
...
* commit '2e0f0bb3fe63c51fa3154f8ed17bfaf611edbf5d':
Remove unnecessary library functions.
2011-01-20 17:03:39 -08:00
Wink Saville
ae4fe1f7ab
am 18fcb8d8: Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb
...
* commit '18fcb8d84abf529aad7e5b2ff5f1a9b6d7e0cbe8':
Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE
2011-01-20 17:03:13 -08:00
Dianne Hackborn
27044f1d4c
Merge "Fix issue #3352125 : Crash after clearing search query" into honeycomb
2011-01-20 16:57:34 -08:00
Andy Stadler
0fe45dea92
Read actual device encryption status
...
Bug: 3346770
Change-Id: Ie70c14b1b4584a5f340a27102145f7860ba9e14b
2011-01-20 16:35:09 -08:00
Brad Fitzpatrick
c0bb0bb5e3
StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
...
Change-Id: I1b2531b66d09c850519af17918aed8be9853ef3b
2011-01-20 16:29:52 -08:00
Amith Yamasani
5890fea6ce
Sync activity picker to latest dialog style.
...
Bug: 3154864
Change-Id: Ia779c6339bffa03685e05860dceaf1d47c47225e
2011-01-20 16:15:21 -08:00
Brad Fitzpatrick
9358bd39dc
Merge "Fixes for StrictMode instance count checking." into honeycomb
2011-01-20 15:56:47 -08:00
Dianne Hackborn
e69e0fde6c
Merge "Fix issue #3374356 : Buttons sometimes don't highlight" into honeycomb
2011-01-20 15:38:14 -08:00
Justin Ho
46833c45bf
Merge "Updated sysbar lights out assets and recents bg protect tile" into honeycomb
2011-01-20 15:27:06 -08:00
Justin Ho
81ed2b6d9b
Updated sysbar lights out assets and recents bg protect tile
...
Change-Id: I28431bb499f7950c672a5fb39d8025ac239da54b
2011-01-20 15:25:05 -08:00
Dianne Hackborn
be1f62260a
Fix issue #3374356 : Buttons sometimes don't highlight
...
On touch up, View would move itself to the pressed state if it
hadn't already shown as pressed. However, it did this *after*
scheduling the message to deliver the onClick(). Thus if the
app took a little too long to execute inside of onClick(), the
invalidate to draw the highlight state would be executed right
before the following message to remove the highlight state,
causing it to basically not be shown.
This change just does the invalidate before scheduling the
onClick, so we can be sure it gets done first.
Change-Id: I6a4d1742a3aab60969c38b44bb3e163f48de62d4
2011-01-20 15:24:28 -08:00
Andreas Huber
601fe0e595
Implement missing pause/resume support for NuPlayer.
...
Change-Id: Ia3f1ce521dd4b70e134ef03aa7c9db8e8d39a134
related-to-bug: 2368598
2011-01-20 15:23:04 -08:00
Brad Fitzpatrick
5f8b5c191c
Fixes for StrictMode instance count checking.
...
Misc stuff found after looking at the first day of data, Jesse's
review, and comments from Dianne about tracking Activity counts
better.
Change-Id: Ifee1ef8f59f41061d4aac8c02765627dbf3cd8e4
2011-01-20 15:12:08 -08:00
Dianne Hackborn
6e1bf6a305
Fix issue #3352125 : Crash after clearing search query
...
Don't deliver data arriving from a Loader after the application
has moved on to a new Loader.
Also throttle the number of Loaders will have actively running
for a particular ID.
Oh, and documentation. Documentation is good.
Change-Id: I5a5cfdbb8c9bfb320ffc014f99e37fe7e3001382
2011-01-20 14:58:40 -08:00
Santosh Madhava
bdb2e79a41
Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
...
Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
2011-01-20 14:52:06 -08:00
Adam Powell
9c91c7e27f
Merge "Fix bug 3362375 - API REVIEW: remove unused public 'up' id" into honeycomb
2011-01-20 14:39:56 -08:00
Christopher Tate
7fb8b565f9
Include the local state obj in ACTION_DRAG_STARTED events
...
Fixes bug 3362502
The underlying cause was that the DragEvent.obtain() variant which
clones an existing event was failing to copy the local state field.
This change also moves the logic for inserting the local state object
into DragEvents about to be dispatched from the Binder incall thread
into the main-thread code sequence. This is to eliminate any potential
SMP memory coherency issues around drag start vs incoming events
needing to refer to the local state object.
Change-Id: I368e8936dbf8a00b7d5cc19c2ef0101bd75b6b2d
2011-01-20 13:53:17 -08:00
Daniel Sandler
a7cb63a153
Merge "Remove inappropriate triangle icons from quick settings panel." into honeycomb
2011-01-20 13:31:53 -08:00