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
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
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
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
Kenny Root
6af08a47d0
Merge "Don't pay attention to string block on @null" into honeycomb
2011-01-20 13:27:35 -08:00
Trevor Johns
2ca4d8b7b9
Merge "Fixing bugs in HelloWebView tutorial on developer.android.com." into honeycomb
2011-01-20 13:19:25 -08:00
Kenny Root
7fbe4d2e74
Don't pay attention to string block on @null
...
When someone referenced an empty string by putting in the special value
"@null" the string block was kept, but when filtering themes this wasn't
filtered because the framework thought it was actually a null string.
Bug: 3000940
Change-Id: I1e9a0479ef761b3e388b562ae728c5da0f4b5deb
2011-01-20 13:18:03 -08:00
Trevor Johns
b99d136f25
Fixing bugs in HelloWebView tutorial on developer.android.com.
...
- Top-level LinearLayout needs to fill_parent, rather than wrap_content,
otherwise the child WebView has 0 width
- setWebViewClient() needs to construct a new HelloWebViewClient, not
WebViewClientDemo (which doens't exist).
Change-Id: Ie8b14e0cbf2b498573e965ccfc27b858dedabfa0
2011-01-20 13:04:17 -08:00
Joe Onorato
913d04aa3b
Merge "Don't log the full stack trace when we can't load a resource." into honeycomb
2011-01-20 12:33:34 -08:00
Mathias Agopian
35e4a497f4
Merge "fix [3369743] SurfaceFlinger reads hardware composer hints before calling hwc.prepare()" into honeycomb
2011-01-20 12:25:33 -08:00
Mathias Agopian
a423d86800
Merge "clean-up unneeded code" into honeycomb
2011-01-20 12:25:26 -08:00
Daniel Sandler
f175155dfb
Remove inappropriate triangle icons from quick settings panel.
...
Bug: 3316041
Change-Id: I877a587ecd6a6a8a0b00322bdcd46e3f4235a887
2011-01-20 15:24:45 -05:00
Stephen Hines
2e0f0bb3fe
Merge "Remove unnecessary library functions." into honeycomb
2011-01-20 12:23:32 -08:00
Wink Saville
18fcb8d84a
Merge "Add two more parameters too RIL_REQUEST_SETUP_DATA_CALL, DO NOT MERGE" into honeycomb
2011-01-20 12:20:59 -08:00
Mathias Agopian
1d4549ab03
clean-up unneeded code
...
now that we removed the notion of a "inUse" buffer in surfaceflinger
a lot of code can be simplified / removed.
noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete"
is also gone.
Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
2011-01-20 12:10:11 -08:00
Daniel Sandler
6bc9eca3fa
am 04fba96b: Merge "Animate transitions between notification & settings panels." into honeycomb
...
* commit '04fba96bb7e3fdac2fe3b396ff5cc6560c13ecb5':
Animate transitions between notification & settings panels.
2011-01-20 12:02:48 -08:00
Daniel Sandler
04fba96bb7
Merge "Animate transitions between notification & settings panels." into honeycomb
2011-01-20 12:01:05 -08:00
Stephen Hines
a16a981453
Remove unnecessary library functions.
...
Change-Id: I47fadb2b9e8b9e9ef5f139470366ce43c75fadbb
2011-01-20 11:59:07 -08:00
Joe Onorato
08f1654417
Don't log the full stack trace when we can't load a resource.
...
Bug: 3369315
Change-Id: I3a586bbefccbd59a0e99d712efe9a1cd3da6d058
2011-01-20 11:50:12 -08:00
Romain Guy
cff27e523d
am c8219299: Merge "Remove unnecessary code." into honeycomb
...
* commit 'c8219299b0003793cee8049b96a3bf7530765eea':
Remove unnecessary code.
2011-01-20 11:39:18 -08:00
Romain Guy
c8219299b0
Merge "Remove unnecessary code." into honeycomb
2011-01-20 11:37:22 -08:00
Romain Guy
ff26a0c1c9
Remove unnecessary code.
...
Change-Id: I83eba3406c26a4028af08b4d4c95ecd02803e75a
2011-01-20 11:39:09 -08:00
Huahui Wu
baa647e325
am 292f39c1: Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
...
* commit '292f39c1201f2f08ac90d5562a7fd7070e9b32a0':
b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
2011-01-20 11:13:36 -08:00
Huahui Wu
292f39c120
Merge "b/3350774 Enforce clearing the flag mIsHandlingMultiTouch." into honeycomb
2011-01-20 11:08:33 -08:00
Svetoslav Ganov
f008667e6d
am 1ec1fdfc: Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
...
* commit '1ec1fdfce959069f3092c15d27efc1c2286dc15c':
API REVIEW: android.widget.NumberPicker.OnValueChangedListener
2011-01-20 11:04:27 -08:00
Svetoslav Ganov
1ec1fdfce9
Merge "API REVIEW: android.widget.NumberPicker.OnValueChangedListener" into honeycomb
2011-01-20 11:02:14 -08:00
Romain Guy
1eaac21e6f
am 68c56a51: Merge "Documentation fix." into honeycomb
...
* commit '68c56a51b32b5f5322c4f0f7dbba918712ad6473':
Documentation fix.
2011-01-20 11:00:19 -08:00
Romain Guy
482b34a6f8
Documentation fix.
...
Activity's documentation wasn't clear on what would happen when
calling setContentView(View).
Change-Id: I37be6565ba897694460c80a39562346293faa8ea
2011-01-20 10:59:28 -08:00
Romain Guy
68c56a51b3
Merge "Documentation fix." into honeycomb
2011-01-20 10:57:59 -08:00
Svetoslav Ganov
cedc446684
API REVIEW: android.widget.NumberPicker.OnValueChangedListener
...
Change-Id: I1e739553ab6b99b2768e42cf379a0b155dced81a
2011-01-20 10:41:14 -08:00
Eric Laurent
4dcaeb6d77
am 404946fc: Merge "Fix issue 3371096." into honeycomb
...
* commit '404946fc260e5dff23c8a0db12e33ff842ab4b47':
Fix issue 3371096.
2011-01-20 10:33:29 -08:00
Eric Laurent
404946fc26
Merge "Fix issue 3371096." into honeycomb
2011-01-20 10:31:21 -08:00
Svetoslav Ganov
655f6e1026
am 19484fac: Merge "Some touches on the NumberPicker UI." into honeycomb
...
* commit '19484fac336ce1606a9f0b464d6bfc33ae0523e7':
Some touches on the NumberPicker UI.
2011-01-20 10:10:20 -08:00
Svetoslav Ganov
19484fac33
Merge "Some touches on the NumberPicker UI." into honeycomb
2011-01-20 10:08:39 -08:00
Gilles Debunne
a04cfb9a02
am 6b20dc43: Merge "Error popup no longer flickers in TextViews." into honeycomb
...
* commit '6b20dc43a0b835254840746f1027945b5414654b':
Error popup no longer flickers in TextViews.
2011-01-20 09:55:32 -08:00
Gilles Debunne
6b20dc43a0
Merge "Error popup no longer flickers in TextViews." into honeycomb
2011-01-20 09:53:18 -08:00
Daniel Sandler
14db0bc047
Animate transitions between notification & settings panels.
...
We're still not stretching the panel smoothly yet; this just
fades the panels in and out at the right times.
Bug: 3323063
Change-Id: I6eb87c44726f48f39fab77710b1ffe5d0783d588
2011-01-20 12:44:11 -05:00
James Dong
3230f1a97d
am 637739d4: Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
...
* commit '637739d4bf014e82af19ec4465e6031579ca6eea':
Eliminate recording sound by starting the video track before audio track.
2011-01-20 09:28:55 -08:00
James Dong
637739d4bf
Merge "Eliminate recording sound by starting the video track before audio track." into honeycomb
2011-01-20 09:27:01 -08:00
Huahui Wu
bc7c148285
b/3350774 Enforce clearing the flag mIsHandlingMultiTouch.
...
b/3350774 was fixed by https://android-git.corp.google.com/g/#change,91337
But there is small chance that the flag mIsHandlingMultiTouch is not cleared
correctly. This CL enforces to clear the flag.
Change-Id: I79ba6b401a7d7b3c772d3f123912343491551507
2011-01-20 09:23:09 -08:00
Iain Merrick
bf98190b4b
am 8192b417: Merge "Add BrowserFrame.setCertificate() method." into honeycomb
...
* commit '8192b4179fd96629383c15f19f38edb22b674e99':
Add BrowserFrame.setCertificate() method.
2011-01-20 08:19:37 -08:00
Iain Merrick
8192b4179f
Merge "Add BrowserFrame.setCertificate() method." into honeycomb
2011-01-20 08:17:15 -08:00
Ken Wakasa
7fff9d8e04
am 586f0513: Refine InputMethodInfo API
...
* commit '586f051375d8d7aeece05329921f9f66fc6164cb':
Refine InputMethodInfo API
2011-01-20 08:14:19 -08:00