77575 Commits

Author SHA1 Message Date
Adam Powell
1b4dc0fe00 Merge "Volume control in MediaRouter dialogs" into jb-dev 2012-06-17 19:32:22 -07:00
Adam Powell
706a869900 Merge "Make MediaRouter UI more robust around route count changes" into jb-dev 2012-06-17 19:32:07 -07:00
Jeff Brown
d7a04de167 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
2012-06-17 15:55:46 -07:00
Jeff Brown
22aa512026 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
2012-06-17 15:51:30 -07:00
Adam Powell
4599696591 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
2012-06-16 17:21:57 -07:00
Adam Powell
39d5c61725 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
2012-06-16 14:49:13 -07:00
Makoto Onuki
c4637d3efb Merge "Allow restricting the scope of a phone-filter search" into jb-dev 2012-06-16 12:34:56 -07:00
Daniel Lehmann
1024de5961 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
2012-06-15 20:32:33 -07:00
Adam Powell
130b4572d1 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
2012-06-15 20:19:29 -07:00
Dianne Hackborn
d8bbf96a84 Merge "Fix issue #6664140: Time to lock should work even Stay awake..." into jb-dev 2012-06-15 17:48:54 -07:00
Dianne Hackborn
2fe8fb276c 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
2012-06-15 17:23:16 -07:00
Adam Powell
fd4df46917 Merge "Remove workaround for bug that was fixed a while ago." into jb-dev 2012-06-15 15:32:14 -07:00
Jeff Brown
5aa02e2018 Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev 2012-06-15 15:30:40 -07:00
Jim Miller
b06be57f0a Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev 2012-06-15 15:19:16 -07:00
Adam Powell
307c5cfcdd Remove workaround for bug that was fixed a while ago.
Change-Id: I368dd8fea6b33af6908b6fe3b7691104166a707a
2012-06-15 15:19:09 -07:00
Svetoslav Ganov
531d5866d8 Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev 2012-06-15 15:00:43 -07:00
Ying Wang
c1568feaba Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-15 14:19:08 -07:00
Ying Wang
2f8ee7448d Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-15 14:18:13 -07:00
Dianne Hackborn
87959cdd85 Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev 2012-06-15 14:10:42 -07:00
Eric Laurent
c4f4b0f0a4 Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev 2012-06-15 14:01:49 -07:00
Teng-Hui Zhu
2075f2d3e4 Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev 2012-06-15 13:57:28 -07:00
Dianne Hackborn
632ca417f0 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
2012-06-15 13:15:35 -07:00
Ying Wang
51a0ea208b Import translations. DO NOT MERGE
Change-Id: I3634d090275ecbd789e89266910ede4e4e1d8566
2012-06-15 13:06:55 -07:00
Dianne Hackborn
17b9cec1b6 Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev 2012-06-15 13:05:26 -07:00
Ying Wang
249405253d Import translations. DO NOT MERGE
Change-Id: I6ab3489fe984c442dceaef41e76ee5e6783e65ef
2012-06-15 12:44:39 -07:00
Kenny Root
4de60b2609 Merge "Make lib dir before changing ownership of app dir" into jb-dev 2012-06-15 12:37:39 -07:00
Dianne Hackborn
6e3d6daa37 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
2012-06-15 12:12:56 -07:00
Adam Powell
27db797e37 Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 2012-06-15 11:52:10 -07:00
Eric Laurent
242b33870b AudioManager: back to old setBluetoothA2dpOn()
Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn().

MediaRouter will call methods on IAudioService directly.

Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
2012-06-15 11:48:50 -07:00
Daniel Sandler
708f0739a5 Merge "Hide "no internet connection" when connected some other way." into jb-dev 2012-06-15 11:46:35 -07:00
Teng-Hui Zhu
6a9586bc57 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
2012-06-15 11:27:34 -07:00
Svetoslav Ganov
8ffe8b304e 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
2012-06-15 10:50:23 -07:00
Daniel Sandler
67234c4b87 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
2012-06-15 13:21:16 -04:00
Justin Ho
137bfad24f Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev 2012-06-15 09:23:25 -07:00
Daniel Sandler
2fc45503dd Merge "Concatenate SPN and PLMN with a pipe." into jb-dev 2012-06-15 09:17:03 -07:00
Justin Ho
b633a039a0 Jelly Bean ringtone
Bug: 6619980

Change-Id: I717c66274d3efaafb0caa60204d311732c182268
2012-06-15 08:48:49 -07:00
Adam Powell
b5e2af5919 Update MediaRouteChooserDialog grouping UI
Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
2012-06-15 00:11:34 -07:00
Jeff Brown
ba726113e5 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
2012-06-14 23:48:40 -07:00
Jim Miller
2de5ee8463 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
2012-06-14 22:22:50 -07:00
Dianne Hackborn
734f0214ec Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev 2012-06-14 21:33:48 -07:00
Jeff Brown
5c74bca49a Merge "Synthesize fake vsyncs when the screen is off." into jb-dev 2012-06-14 21:30:49 -07:00
Daniel Sandler
8b96a660e5 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
2012-06-14 23:54:55 -04:00
Jeff Brown
858491ba13 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
2012-06-14 20:33:42 -07:00
Matthew Xie
839734bbe5 Merge "Handle ENITR failure for Headset control channel." into jb-dev 2012-06-14 20:28:46 -07:00
Matthew Xie
be513afb62 Handle ENITR failure for Headset control channel.
Wrap poll and read with TEMP_FAILURE_RETRY
bug 6503000, 6623444

Change-Id: I2e302dc04df6b5bd5982c3d189881a687a95fb2d
2012-06-14 20:08:40 -07:00
Dianne Hackborn
b80395c17d 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
2012-06-14 19:38:20 -07:00
Christopher Tate
0e44a6beea Merge "Don't finish noHistory="true" activities behind the lock screen" into jb-dev 2012-06-14 19:35:58 -07:00
Adam Powell
90b9f84c43 Merge "API updates for MediaRouter" into jb-dev 2012-06-14 17:51:27 -07:00
Christopher Tate
7661bc6c5a Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev 2012-06-14 17:34:28 -07:00
Svetoslav Ganov
2657a59f54 Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev 2012-06-14 17:19:54 -07:00