OSDN Git Service
Chet Haase [Tue, 19 Jun 2012 22:59:27 +0000 (15:59 -0700)]
Merge "Handle non-started LayoutTransition animations correctly" into jb-dev
Chet Haase [Tue, 19 Jun 2012 20:54:29 +0000 (13:54 -0700)]
Handle non-started LayoutTransition animations correctly
A recent change to LayoutTransition noop'd animations in non-visible
parents, to avoid artifacts like scaling/moving from (0,0,0,0). But there
was logic in ViewGroup that didn't account for transitions that didn't actually
run an animation, causing a disconnect between the state of a parent (getting ready
to remove an item later) and the state of the transition (not running, therefore
not needing the child to be removed later).
The fix was to detect when the transition did not start and avoid adding the
view to the list of children to be removed later.
Issue #
6602502 Playing video through crackle application only audio is heard no video is displayed
Change-Id: Id5260580ab0d6dd165c62006c7bd579fd821a5f5
Jim Miller [Tue, 19 Jun 2012 22:23:03 +0000 (15:23 -0700)]
Merge "Fix
6667238: allow market apps to support ACTION_ASSIST" into jb-dev
Craig Mautner [Tue, 19 Jun 2012 22:08:41 +0000 (15:08 -0700)]
Merge "Clear sendingToBottom when animation is complete." into jb-dev
Jim Miller [Tue, 19 Jun 2012 02:23:39 +0000 (19:23 -0700)]
Fix
6667238: allow market apps to support ACTION_ASSIST
This change allows market apps and 3rd parties to supply an activity
that responds to ACTION_ASSIST (e.g. market apps).
It also adds a test app to respond to the ASSIST intent and force
the intent disambiguation dialog to appear.
Change-Id: I5a78863c6a9546d18c66275187d178f6a1c9ee17
Eric Fischer [Tue, 19 Jun 2012 21:43:50 +0000 (14:43 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Eric Fischer [Tue, 19 Jun 2012 21:38:50 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I050bc722a5a06acc49fc519d57bf16b14158e97a
Craig Mautner [Tue, 19 Jun 2012 21:10:01 +0000 (14:10 -0700)]
Clear sendingToBottom when animation is complete.
Was counting on moving the app to the top to clear the flag
indicating that the app was being sent to the bottom. Since this
did not always happen the sendingToBottom flag was occasionally
left set. In this case the focus was skipped for that app and
consequently input was never propagated to it.
This fix clears the sendingToBottom flag each time the app
animations are completed.
Fixes bug
6691421.
Change-Id: I6f851dc5bedca95182db8490d87c876a71ad5fde
Jeff Sharkey [Tue, 19 Jun 2012 20:32:22 +0000 (13:32 -0700)]
Handle SCREEN_ON/OFF broadcasts without blocking.
NetworkPolicy currently uses a single background thread to process
various broadcasts. When processing other broadcasts, this thread
can block our handling of SCREEN_ON/OFF, which are sent as ordered
broadcasts.
This change moves SCREEN_ON/OFF handling to the main thread, and
dispatches a one-way message to the background thread, allowing the
ordered broadcast to always proceed.
Bug:
6677047
Change-Id: I52de2c7b75beb8059bb87e123689ba4a9c4ae349
Dianne Hackborn [Tue, 19 Jun 2012 17:54:42 +0000 (10:54 -0700)]
Merge "Docs only: DENSITY_TV, not just for TVs any more!" into jb-dev
Jean-Michel Trivi [Tue, 19 Jun 2012 17:54:32 +0000 (10:54 -0700)]
Merge "Remote volume handling" into jb-dev
Adam Powell [Tue, 19 Jun 2012 04:36:23 +0000 (21:36 -0700)]
Merge "MediaRouter bluetooth a2dp selection" into jb-dev
Adam Powell [Mon, 18 Jun 2012 23:14:46 +0000 (16:14 -0700)]
MediaRouter bluetooth a2dp selection
Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn
Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.
Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
Dianne Hackborn [Tue, 19 Jun 2012 02:29:45 +0000 (19:29 -0700)]
Docs only: DENSITY_TV, not just for TVs any more!
Change-Id: Id70e0bc179ab405fbb7f3b2cda7b75f44ff30b57
Gilles Debunne [Tue, 19 Jun 2012 01:53:30 +0000 (18:53 -0700)]
Merge "Fixed text rendering issue with spans." into jb-dev
Jean-Michel Trivi [Mon, 11 Jun 2012 22:03:52 +0000 (15:03 -0700)]
Remote volume handling
Extend RemoteControlClient class to enable an applicaton to
specify more information about how it's playing media, now covering
usecases where media playback happens "remotely". This playback
information can be used to set the volume and maximum volume
used remotely.
Declare a new intent and associated extras in Intent,
ACTION_VOLUME_UPDATE, so an application can be notified that
the volume it handles should be updated. It can then use
the new RemoteControlClient.setPlaybackInformation() method
to notify AudioService what the volume is.
Extend AudioService to maintain playback information associated
with the RemoteControlClient information in the stack of
media button event receivers (mRCStack). The information
about the active remote is cached so the stack doesn't have
to be iterated over in order to retrieve remote playback info.
Events to "adjust" the remote volume based on hardware key
presses cause the client application to be notified of
volume updates, and the volume panel to display the volume
set by the app.
Revise which stream type is controlled when none is specified
according to latest guidelines for remote playback.
Update VolumePanel class to support a new pseudo stream type,
AudioService.STREAM_REMOTE_MUSIC, that corresponds to the
remote playback volume, and uses the new "media route" icon.
Enable it to receive asynchronously new volume values for
the remote that will be displayed if the UI is still up,
and ignored otherwise.
Now supports hiding/showing sliders dynamically so remote
volume only appears when AudioService has a remote control
client handling remote volume.
Define new java symbols for the two media route icons.
Modify lockscreen behavior: don't automatically control music
volume when music is active, consider also remote playback.
Still to do:
- playback information set by RemoteControlClient should post
a message for AudioService to update playback information
instead of updating it synchronously
Change-Id: I557aa687239f9acfe33a609f05876c67fa7eb967
Craig Mautner [Tue, 19 Jun 2012 01:01:53 +0000 (18:01 -0700)]
Merge "More paths for turning on screen immediately." into jb-dev
Nicolas Falliere [Tue, 19 Jun 2012 00:39:48 +0000 (17:39 -0700)]
Merge "Added or fixed doctrings for required permissions." into jb-dev
Nicolas Falliere [Tue, 19 Jun 2012 00:21:06 +0000 (17:21 -0700)]
Added or fixed doctrings for required permissions.
Bug:
6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
Jim Miller [Tue, 19 Jun 2012 00:22:10 +0000 (17:22 -0700)]
Merge "Fix
6683092: tune GlowPadView wave animation" into jb-dev
Jim Miller [Tue, 19 Jun 2012 00:04:58 +0000 (17:04 -0700)]
Fix
6683092: tune GlowPadView wave animation
This adds some aesthetic changes to the wave animation for GlowPadView:
- wave shape is no longer symmetric
- disable expand in keyguard
- enable expand in SearchPanelView (when mAlwaysTrackFinger == true)
- if a current wave animation isn't finished yet, don't start a new one
- various timing changes
Change-Id: Ibce96f45eb6a94582c694108b99e243fd57b1955
Craig Mautner [Mon, 18 Jun 2012 23:53:27 +0000 (16:53 -0700)]
More paths for turning on screen immediately.
This fix forces the path through the updateLightsLocked method to turn
the screen on immediately if mWaitingForFirstLightSensor is true. Also
do not clear mWaitingForFirstLightSensor if mPreparingForScreenOn
is true. Wait until it turns false.
Fixes bug
6612418.
Change-Id: I03407e748cce4906a73de1f15df1654649b133c4
Amith Yamasani [Mon, 18 Jun 2012 23:49:28 +0000 (16:49 -0700)]
Merge "Don't backup or delete the backup file, if it's in the backup path." into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 23:19:56 +0000 (16:19 -0700)]
Merge "Implement issue #
6680894: Provide a way to configure app defaults..." into jb-dev
Dianne Hackborn [Mon, 18 Jun 2012 22:38:12 +0000 (15:38 -0700)]
Implement issue #
6680894: Provide a way to configure app defaults...
...for a smoother OOB experience
Way provided.
Put your defaults in system/etc/preferred-apps/*.xml.
Figure out what to put there with "adb shell dumpsys package preferred-xml".
Bug:
6680894
Change-Id: Ia06bb0061876274a5f80bf06d1ba5ad155edc323
Jeff Brown [Mon, 18 Jun 2012 21:14:55 +0000 (14:14 -0700)]
Merge "Fix an NPE and possible unsynchronized call of Locked method." into jb-dev
Jim Miller [Mon, 18 Jun 2012 20:29:49 +0000 (13:29 -0700)]
Merge "Fix
6665117: ACTION_ASSIST visual improvements" into jb-dev
Amith Yamasani [Mon, 18 Jun 2012 20:04:27 +0000 (13:04 -0700)]
Don't backup or delete the backup file, if it's in the backup path.
Change-Id: Ie77782722a271e09f8cbde7fb5393e8127d4334d
Jeff Brown [Mon, 18 Jun 2012 19:58:03 +0000 (12:58 -0700)]
Fix an NPE and possible unsynchronized call of Locked method.
Bug:
6680398
Change-Id: Id5ef4fa82b2a5ef5e9c3934ca95156143f91e5e2
Ying Wang [Mon, 18 Jun 2012 19:57:03 +0000 (12:57 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Mon, 18 Jun 2012 19:36:51 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0108055d8a3aa31fb8157b43e0f2224fab488642
Adam Powell [Mon, 18 Jun 2012 19:10:20 +0000 (12:10 -0700)]
Merge "Restrict MediaRouter selection" into jb-dev
Adam Powell [Mon, 18 Jun 2012 18:51:34 +0000 (11:51 -0700)]
Restrict MediaRouter selection
Actually restrict the programmatic selection of routes by
type. (Oops.)
Change-Id: I91e837f7ecbcddb626c664fb470e8296d563498d
Svetoslav Ganov [Mon, 18 Jun 2012 18:27:44 +0000 (11:27 -0700)]
Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
Daniel Sandler [Mon, 18 Jun 2012 18:20:54 +0000 (11:20 -0700)]
Merge "Turn off debug logs." into jb-dev
Svetoslav Ganov [Mon, 18 Jun 2012 17:20:42 +0000 (10:20 -0700)]
Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
Daniel Sandler [Mon, 18 Jun 2012 15:26:43 +0000 (11:26 -0400)]
Turn off debug logs.
Also switch to Slog, which is more appropriate for framework
logging.
Bug:
6684167
Change-Id: I829de86702a9952ce42ec9967c8d493529253426
Justin Ho [Mon, 18 Jun 2012 14:29:02 +0000 (07:29 -0700)]
Merge "Increasing brightness for notification icons and navigation bar icons Bug:
6612414" into jb-dev
Adam Powell [Mon, 18 Jun 2012 02:32:22 +0000 (19:32 -0700)]
Merge "Volume control in MediaRouter dialogs" into jb-dev
Adam Powell [Mon, 18 Jun 2012 02:32:07 +0000 (19:32 -0700)]
Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
Jeff Brown [Sun, 17 Jun 2012 21:17:52 +0000 (14:17 -0700)]
Capture window manager's last ANR state in bug report.
Currently just grabbing the window state but we could grab
other things as part of the last ANR report.
Bug:
6680398
Change-Id: I23aa70907b1bdcb21c8acc556fde196ca790ef6a
Jeff Brown [Sun, 17 Jun 2012 19:01:06 +0000 (12:01 -0700)]
Capture input dispatcher's last ANR state in bug report.
Some ANR bugs are very difficult to localize because by the time
the bug report has been captured, the relevant information is
gone. Work around this by capturing a log of the input dispatcher's
state at the exact time of the ANR before anything has changed
and include this information in the bug report.
Also fixed a nit related to some format strings that had
improper field widths specified.
Bug:
6680398
Change-Id: I5323bf18ec5e47a767cd053209753cc46852bf4c
Svetoslav Ganov [Sun, 17 Jun 2012 22:07:29 +0000 (15:07 -0700)]
API for finding accessibility focus in virtual tree not needed.
1. The function for finding where the accessibility focus in a virtual
node tree presented by an AccessibilityNodeProvider is not needed
API since the framework already keeps track of the accessibility
focused virtual node in order to draw the focus rectangle. This API
adds unnecessary complexity to developers of AccessibilityNodeProviders.
bug:
6675330
Change-Id: I84774686b06a995073a39e45b8ef22f2cd04b773
Adam Powell [Sat, 16 Jun 2012 21:58:39 +0000 (14:58 -0700)]
Volume control in MediaRouter dialogs
MediaRouter dialogs now intercept the volume keys for altering the
current volume. The status icon indicates if the slider/buttons are
currently controlling the local device volume or a remote device's
volume.
Group volume for user routes is handled by using the
RemoteControlClient supplied by the first route in the group.
Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
Adam Powell [Sat, 16 Jun 2012 21:25:38 +0000 (14:25 -0700)]
Make MediaRouter UI more robust around route count changes
Improve the API around ActionProvider visibility overriding. Allow the
application to notify whatever is hosting the ActionProvider that
visibility has changed in a way that is friendly to alternate support
library-style reimplementations of MenuItem.
Allow MediaRouter.Callback implementations to add or remove themselves
or other Callbacks during dispatch of callback events.
Make MediaRouteActionProvider track the visibility of corresponding
menu items more accurately.
Change-Id: Ic7ddb6a87c3637904750d2661e4a9fa323b09ea0
Makoto Onuki [Sat, 16 Jun 2012 19:34:56 +0000 (12:34 -0700)]
Merge "Allow restricting the scope of a phone-filter search" into jb-dev
Daniel Lehmann [Sat, 16 Jun 2012 03:32:33 +0000 (20:32 -0700)]
Allow restricting the scope of a phone-filter search
This also includes a previous change to current.txt that hasn't been
copied to 16.txt yet
Bug:
6662259
Change-Id: Iaab5c38ad56882a1270b5276ba7a399bbb8a49f3
Adam Powell [Sat, 16 Jun 2012 02:21:34 +0000 (19:21 -0700)]
ActionProvider API update
* Add ActionProvider#overridesItemVisibility and isVisible.
These methods allow an ActionProvider to override the
visibility of a MenuItem that it is bound to. If a MenuItem
has been explicitly hidden by the application, it will not
be visible.
* Change MediaRouteActionProvider to not require a MediaRouter
callback, to avoid extra lifecycle management headaches.
Change-Id: I606fa98b3a6a3e60a953dd024274f9bf9c67acdd
Christian Robertson [Sat, 16 Jun 2012 02:36:30 +0000 (19:36 -0700)]
Increasing brightness for notification icons and navigation bar icons
Bug:
6612414
Change-Id: I5ab60f60f5bf502b3b15c30207047285db611ae3
alanv [Sat, 16 Jun 2012 01:59:11 +0000 (18:59 -0700)]
Ensure WebViewClassic calls super.onHoverEvent()
Bug:
6679763
Change-Id: I9b182f25fa1c4050ea3a046c896e82ffbb4651ad
Jim Miller [Sat, 16 Jun 2012 00:26:28 +0000 (17:26 -0700)]
Fix
6665117: ACTION_ASSIST visual improvements
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background
Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
Dianne Hackborn [Sat, 16 Jun 2012 00:48:54 +0000 (17:48 -0700)]
Merge "Fix issue #
6664140: Time to lock should work even Stay awake..." into jb-dev
Dianne Hackborn [Sat, 16 Jun 2012 00:05:25 +0000 (17:05 -0700)]
Fix issue #
6664140: Time to lock should work even Stay awake...
...in Developer options is on
Don't respect stay awake while on as long as a time to lock limit
is being enforced. When we start enforcing one, make sure the
setting is off (since we won't be respecting it anyway).
Bug:
6664140
Change-Id: Id07cb528afa0c64c7766341841c51771f507121d
Adam Powell [Fri, 15 Jun 2012 22:32:14 +0000 (15:32 -0700)]
Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
Jeff Brown [Fri, 15 Jun 2012 22:30:40 +0000 (15:30 -0700)]
Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
Gilles Debunne [Fri, 8 Jun 2012 00:54:47 +0000 (17:54 -0700)]
Fixed text rendering issue with spans.
Bug
6598784
The algorithm uses three imbricated loops:
- paragraphs
- span regions (called "blocks" in that description) in these
- characters in these
We can ignore the paragraphs and assume paraStart==0.
The span region loop cuts the text into blocks of text which share
the same set of MetricAffectingSpan spans applied to them. Note that
spanStart and spanEnd represent such a range, and not necessarily an
actual span range.
The third loop then iterates over the characters of these blocks, and creates
a new line (calling out() as soon as the width has been reached.
The core of the problem comes from the 'nextSpanStart' variable.
It is used to restart the block loop from a previous position in case
a line has been created that does not intersect with the current block.
However, in case the current block is larger than the width of the text,
the character loop is going to create other lines of text before we exit the
j-loop. Going back to the block loop, we reset spanStart to the nextSpanStart,
which may be too far back in the text. As a result, the same range of characters
is measured again.
The (spanStart == spanEnd) test was used to handle the case where
nextSpanStart was indeed assigned to a value different than spanEnd.
This fix simplifies this logic and removes the nextSpanStart variable:
When the created line ends before the current block (here < spanStart), we
immediately exit the character loop, re-starting the block loop from the
current position.
Patch 4: added a fix in measured to handle overlapping character ranges.
Change-Id: Ie71b3cf4018b332e335ea916fef08acb43a6679e
Jim Miller [Fri, 15 Jun 2012 22:19:16 +0000 (15:19 -0700)]
Merge "Fix
6507787: fix MMI PUK unlock procedure" into jb-dev
Adam Powell [Fri, 15 Jun 2012 22:10:58 +0000 (15:10 -0700)]
Remove workaround for bug that was fixed a while ago.
Change-Id: I368dd8fea6b33af6908b6fe3b7691104166a707a
Svetoslav Ganov [Fri, 15 Jun 2012 22:00:43 +0000 (15:00 -0700)]
Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
Ying Wang [Fri, 15 Jun 2012 21:19:08 +0000 (14:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Ying Wang [Fri, 15 Jun 2012 21:18:13 +0000 (14:18 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-dev
Dianne Hackborn [Fri, 15 Jun 2012 21:10:42 +0000 (14:10 -0700)]
Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
Eric Laurent [Fri, 15 Jun 2012 21:01:49 +0000 (14:01 -0700)]
Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
Teng-Hui Zhu [Fri, 15 Jun 2012 20:57:28 +0000 (13:57 -0700)]
Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
Dianne Hackborn [Fri, 15 Jun 2012 02:34:10 +0000 (19:34 -0700)]
Add new callback for MediaRouter to found out about device changes.
The AudioService now has an API to call to get the currently
connected devices, and later reports of changes in connection
state. The information includes the name of the bluetooth
device if one is connected for display to the user, and states
for all of the pluggable devices. No longer requires a Bluetooth
permission to keep the routes updated.
Change-Id: I81ca421c60592fbc1592477d59bf1c9d1b64954a
Ying Wang [Fri, 15 Jun 2012 20:06:55 +0000 (13:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3634d090275ecbd789e89266910ede4e4e1d8566
Dianne Hackborn [Fri, 15 Jun 2012 20:05:26 +0000 (13:05 -0700)]
Merge "Fix issue #
6636731: Mariner animation ring gets stuck" into jb-dev
Ying Wang [Fri, 15 Jun 2012 19:44:39 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ab3489fe984c442dceaef41e76ee5e6783e65ef
Kenny Root [Fri, 15 Jun 2012 19:37:39 +0000 (12:37 -0700)]
Merge "Make lib dir before changing ownership of app dir" into jb-dev
Dianne Hackborn [Fri, 15 Jun 2012 19:05:27 +0000 (12:05 -0700)]
Fix issue #
6636731: Mariner animation ring gets stuck
Weren't cleaning out any ActivityOptions that are still attached
to a finishing activity.
Bug:
6636731
Change-Id: If0520bbcbf1d4ce19d46ff769918893cefda9c87
Adam Powell [Fri, 15 Jun 2012 18:52:10 +0000 (11:52 -0700)]
Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
Eric Laurent [Fri, 15 Jun 2012 18:48:50 +0000 (11:48 -0700)]
AudioManager: back to old setBluetoothA2dpOn()
Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn().
MediaRouter will call methods on IAudioService directly.
Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
Daniel Sandler [Fri, 15 Jun 2012 18:46:35 +0000 (11:46 -0700)]
Merge "Hide "no internet connection" when connected some other way." into jb-dev
Teng-Hui Zhu [Fri, 15 Jun 2012 18:22:23 +0000 (11:22 -0700)]
Notify Java side to start when transition into full screen mode without a reload.
When video start in inline mode, and then transition into full screen mode, the
video is still playing, so we need to notify the player, such that the controller
can get the state correctly.
bug:
6675847
Change-Id: Ib5f712ca91fe1c374dcc20de996dac6ff7b9e983
Svetoslav Ganov [Fri, 15 Jun 2012 17:31:31 +0000 (10:31 -0700)]
Accessibility focus search and setting it from hover are performed by the client.
1. Currently we are providing accessibility focus search algorithm in the
framework and we are also setting accessibility focus from hover. It
appears that implementing a focus search strategy that works for all
accessibility services is non trivial task if feasible. Based on
feedback from the developers of two such services at Google - TalkBack
and BarilleBack - the built in focus search does not quite match what
they need and they would like to implement a custom strategy.
Hence, having APIs for accessibility focus search in the framework does
not make. Therefore, we are hiding this APIs and later will take out the focus
search logic and allow the accessibility service to implement search.
Also putting accessibility focus from hover is tightly integrated with
the focus search since the set of views that get accessibility focus
from hover should be the same as the set of views returned by the
focus search routine. Therefore, we are letting the accessibility service
decide where to put accessibility focus when it gets an accessibility
hover event.
bug:
6675330
Change-Id: Ie152230990a6602f3fd1d82de2177d0b1444d654
Daniel Sandler [Fri, 15 Jun 2012 17:17:39 +0000 (13:17 -0400)]
Hide "no internet connection" when connected some other way.
We now track whether the device is connected at all, and use
this to suppress the disconnected message in the mobile
status string (we previously just looked at wifi
connectivity).
So, if a device is attached via ethernet:
- On wifi-only devices, the combined label is shown in the
notification panel, so you'll see "ETHERNET" (this comes
straight from EthernetDataTracker; at some point we need
localized strings and icons).
- On mobile-data devices (phones), the notification panel
only shows the mobile data label, which will be
suppressed, so you'll see nothing at all.
Bug:
6648292
Change-Id: I9841eaeffe50a4f046afbdc09d80c5bd4d78a839
Justin Ho [Fri, 15 Jun 2012 16:23:25 +0000 (09:23 -0700)]
Merge "Jelly Bean ringtone Bug:
6619980" into jb-dev
Daniel Sandler [Fri, 15 Jun 2012 16:17:03 +0000 (09:17 -0700)]
Merge "Concatenate SPN and PLMN with a pipe." into jb-dev
Justin Ho [Fri, 15 Jun 2012 15:48:49 +0000 (08:48 -0700)]
Jelly Bean ringtone
Bug:
6619980
Change-Id: I717c66274d3efaafb0caa60204d311732c182268
Adam Powell [Fri, 15 Jun 2012 06:06:24 +0000 (23:06 -0700)]
Update MediaRouteChooserDialog grouping UI
Move UserRouteInfo tag support to RouteInfo
Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
Jeff Brown [Fri, 15 Jun 2012 06:48:40 +0000 (23:48 -0700)]
Revert "Synthesize fake vsyncs when the screen is off."
This reverts commit
858491ba13ab5d45a5ec462d002b5856703b1b2b
It turns out that Surface Flinger is supposed to generate fake vsyncs while the screen is off, but sometimes it wasn't working due to a bug. That bug has now been fixed by the following change: I7c6abc23bb021d1dfc94f101bd3ce18e3a81a73e
Jim Miller [Fri, 15 Jun 2012 05:22:50 +0000 (22:22 -0700)]
Fix
6507787: fix MMI PUK unlock procedure
This fixes a bug where the user uses the MMI sequence (**05*PUK*PIN1*PIN1#)
from the EmergencyDialer to unlock their phone instead of the provided interface.
The code now recognizes when UnlockMode becomes invalid because it was previously
locked because of SIM state. It then dismisses the PUK unlock screen and advances
to the home screen.
Change-Id: I8902350e6f640cd2fa0af3460c3ea1a39d926c8a
Dianne Hackborn [Fri, 15 Jun 2012 04:33:48 +0000 (21:33 -0700)]
Merge "Help out issue #
6654729: CAB + screen off during playback" into jb-dev
Jeff Brown [Fri, 15 Jun 2012 04:30:49 +0000 (21:30 -0700)]
Merge "Synthesize fake vsyncs when the screen is off." into jb-dev
Daniel Sandler [Fri, 15 Jun 2012 03:54:55 +0000 (23:54 -0400)]
Concatenate SPN and PLMN with a pipe.
Prior change 199020 fixes it for instances of CarrierLabel;
this fixes it for customers of NetworkController.
Bug:
6639047
Change-Id: I69dada2298f4a3caf453f43d847cdb32fe7eaa9f
Jeff Brown [Fri, 15 Jun 2012 02:03:44 +0000 (19:03 -0700)]
Synthesize fake vsyncs when the screen is off.
When the screen is off, we might not receive real vsync pulses from
the hardware which would cause posted Choreographer callbacks to not run.
This is bad because messages in the Looper might be blocked behind a barrier
that is scheduled to be removed by one of those Choreographer callback
(see ViewRootImpl.doTraversals). Until the barrier is removed, those messages
will not run. To prevent starvation of the Looper, we synthesize fake vsync
pulses at a reduced rate whenever the display hardware stops generating them.
This change should fix a variety of rare non-deterministic bugs where
the system might appear to be unresponsive while the screen is off,
and spurious ANRs reported shortly after the screen is turned back on.
Bug:
6574842
Bug:
6636995
Bug:
6643559
Change-Id: I263f2fdf979afd79e5ac47a0cc5d34a93b860c21
Matthew Xie [Fri, 15 Jun 2012 03:28:46 +0000 (20:28 -0700)]
Merge "Handle ENITR failure for Headset control channel." into jb-dev
Matthew Xie [Fri, 15 Jun 2012 03:08:40 +0000 (20:08 -0700)]
Handle ENITR failure for Headset control channel.
Wrap poll and read with TEMP_FAILURE_RETRY
bug
6503000,
6623444
Change-Id: I2e302dc04df6b5bd5982c3d189881a687a95fb2d
Dianne Hackborn [Fri, 15 Jun 2012 02:38:20 +0000 (19:38 -0700)]
Help out issue #
6654729: CAB + screen off during playback
People generally expect, if they are using FLAG_KEEP_SCREEN_ON,
that the screen won't immediately dim after it is cleared, even
if it has been passed the user activity timeout since the last
user interaction. So include the flag to reset the user activity
timeout when releasing its wake lock.
Change-Id: If7a8fea8faef3edbf13dff10a2f248adc9e3ff0b
Christopher Tate [Fri, 15 Jun 2012 02:35:58 +0000 (19:35 -0700)]
Merge "Don't finish noHistory="true" activities behind the lock screen" into jb-dev
Adam Powell [Fri, 15 Jun 2012 00:51:25 +0000 (17:51 -0700)]
Merge "API updates for MediaRouter" into jb-dev
Christopher Tate [Fri, 15 Jun 2012 00:34:28 +0000 (17:34 -0700)]
Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev
Svetoslav Ganov [Fri, 15 Jun 2012 00:19:54 +0000 (17:19 -0700)]
Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev
Christopher Tate [Fri, 15 Jun 2012 00:00:48 +0000 (17:00 -0700)]
Run the screen on/off broadcasts at foreground priority
Bug
6643559
Change-Id: I392f11dabea518238d0f4336c3663bf5c7d46146
Christopher Tate [Thu, 14 Jun 2012 21:16:54 +0000 (14:16 -0700)]
Don't finish noHistory="true" activities behind the lock screen
The foreground activity is stopped when the device goes to sleep,
and started again when the device is unlocked. We now distinguish
this case from a "normal" stop, and do not finish() a foreground
noHistory="true" activity inappropriately when the device sleeps.
We also detect the case where an activity is started while the
device is still asleep, in which case the foreground noHistory
activity is cleaned up as part of bringing the new activity to
the foreground.
Bug
6657549
Change-Id: I9c6a0830aed0e47e4207b62803b90067c8486112
Adam Powell [Thu, 14 Jun 2012 23:04:12 +0000 (16:04 -0700)]
API updates for MediaRouter
* Accept a Context when fetching the names of routes and
categories. This lets string resources resolve at time of access
with the correct configuration. The older versions remain available
that will use the static resources from the application. (There are
enough cases where applications will populate this from external
data that requiring it each time even when it was not initialized
from a resource doesn't seem reasonable.)
* Remove the ability for apps to programmatically select non-user
routes.
* Make MediaRouter.Callback an abstract class instead of an interface.
This will make further extensions easier to keep compatible in the
future.
Change-Id: If981c511dfbdfaf41ef0d1cfe4a377fc14bb5600
George Mount [Thu, 14 Jun 2012 23:14:16 +0000 (16:14 -0700)]
Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev
Daniel Sandler [Thu, 14 Jun 2012 23:07:45 +0000 (16:07 -0700)]
Merge "Show even fewer notifications in Setup." into jb-dev
Kenny Root [Thu, 14 Jun 2012 20:05:18 +0000 (13:05 -0700)]
Make lib dir before changing ownership of app dir
Bug:
6668897
Change-Id: I8998a50359892277b15e80b5b5590ff94b125467
alanv [Thu, 14 Jun 2012 22:24:19 +0000 (15:24 -0700)]
Add support for NEXT_HTML_ELEMENT to WebViewClassic.
Bug:
6663344
Change-Id: Ieb48998e3af12916fe499a12d5bf7a767df8d05b