Merge commit 'cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken
* commit 'cdb9839a569819f233c6d0d9658ffa1fab938794':
Add a test of EGL pausing and resuming.
Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp
* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
Add a test of EGL pausing and resuming.
Killing the WifiWatchdogService thread from
WifiService can cause messages to be handled on
a dead thread. Quit the thread on the broadcast
instead.
A couple of more fixes:
- Do an asynchronous bring up of Wifi. This will
allow WifiWatchdogServiceThread to be immediately
brought up, instead of relying on an update.
- There is no need to listen on supplicant connection
in wifiwatchdog anymore. We kill the thread when
supplicant connection is no more.
Bug: 2546756
Change-Id: I15a188e031bc79856c55aabdd271287b0df0377d
Merge commit '5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken
* commit '5849606df71fb3d5ce88b966cff8382deccd56b6':
Fix typos in comment.
CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.
Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken
* commit '3e9032e646c898a725c256c90031494cc349eea0':
Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts
Merge commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken
* commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
Implement audio focus support in the notification manager.
This change introduces the NotificationPlayer class which was
created from the code of android.media.AsyncPlayer. The only modification
was to modify the construction of the MediaPlayer so it properly issues
onCompletion notifications (which are used to abandon audio focus).
Unless the sound to be played is looped, the notification is transient
and other apps may duck (uses AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK in
audio focus request).
Change-Id: I69cbb71d0892447b934351384e4e24a2e239295b
Use the content width to calculate the zoom overview
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.
By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.
Fix http://b/issue?id=2551119
width. We used to use the minimum preferred width
to calculate the overview width as it is what we
use to define the viewport width. But some sites,
like cbsnews, engadget, the content width will be
slightly wider than the viewport width decided by
the min preferred width. The result is we can still
scroll a little bit in the overview mode. This issue
is magnified when we introduce the overscroll feature.
By using content width as zoom overview width, we
will have content fit in the overview mode. But
some sites, like
"http://www.sfjazz.org/concerts/2010/spring/artists/towner.php"
will be layout wider in the overview mode than it
is in the zoom in state. This is a tradeoff.
Fix http://b/issue?id=2551119
When receiving a message to delete the root layer, delay it until the next
new picture message, so that the layers only disappear when we start displaying
the new page, and not the moment the DOM on the old page is destroyed.
Merge commit '0ca25191c663ef229f1f475b17899f2017ed6980' into kraken
* commit '0ca25191c663ef229f1f475b17899f2017ed6980':
Add some comments for zoom methods.
