77556 Commits

Author SHA1 Message Date
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
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
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
Christopher Tate
2cb1357d1b Run the screen on/off broadcasts at foreground priority
Bug 6643559

Change-Id: I392f11dabea518238d0f4336c3663bf5c7d46146
2012-06-14 17:00:48 -07:00
Christopher Tate
d3f175c817 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
2012-06-14 16:51:58 -07:00
Adam Powell
0d03c042f9 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
2012-06-14 16:16:31 -07:00
George Mount
0777558f03 Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev 2012-06-14 16:14:16 -07:00
Daniel Sandler
68a808bc70 Merge "Show even fewer notifications in Setup." into jb-dev 2012-06-14 16:07:45 -07:00
Kenny Root
4503cf67b5 Make lib dir before changing ownership of app dir
Bug: 6668897
Change-Id: I8998a50359892277b15e80b5b5590ff94b125467
2012-06-14 15:28:37 -07:00
alanv
8bab6de6e2 Add support for NEXT_HTML_ELEMENT to WebViewClassic.
Bug: 6663344
Change-Id: Ieb48998e3af12916fe499a12d5bf7a767df8d05b
2012-06-14 15:24:19 -07:00
Svetoslav Ganov
9add56546b Merge "AccessibilityInjector should return false on a failed action." into jb-dev 2012-06-14 15:14:14 -07:00
George Mount
89654a8f69 DO NOT MERGE Respect the "Make password visible" setting.
Bug 6667146

 Webkit Change: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972

Change-Id: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61
2012-06-14 15:10:09 -07:00
Craig Mautner
8b9c6d51d5 Merge "Expose apps when keyguard animating." into jb-dev 2012-06-14 14:55:19 -07:00
Michael Jurka
a676cdab11 Merge "Tweak recents launch app animation" into jb-dev 2012-06-14 14:33:55 -07:00
Romain Guy
a989b334fd Merge "Don't create a giant layer for all notifications Bug #6642475" into jb-dev 2012-06-14 14:32:07 -07:00
Romain Guy
54ab347fdd Don't create a giant layer for all notifications
Bug #6642475

When expanding the status bar, create one layer per notification instead of
a single giant layer for the pile of notifications. This prevents layer
creation failure when the total height of the notifications is larger
than the maximum allowed texture size in OpenGL ES 2.0.

This change only enables layers on notifications that will be visible
once the notification area is fully expanded.

Change-Id: I3c791a66cf5ac0973f3a65cfcd84b95209d580f3
2012-06-14 14:25:08 -07:00
Craig Mautner
f03e4c55fc Expose apps when keyguard animating.
Continuing in the trend of not hiding apps while the keyguard is
animating.

Fixes bug 6653600.

Change-Id: I151315084a13dcec061d2d6edccd31e1133610f4
2012-06-14 14:11:27 -07:00
Eino-Ville Talvala
d2ee4960c4 Merge "Remove Disco video from builds." into jb-dev 2012-06-14 14:02:46 -07:00
Daniel Sandler
590d515d91 Show even fewer notifications in Setup.
Restricting to pkg="android" didn't filter out things like
open wifi networks, etc. So now we have a whitelist:
notifications must be sent the "android" pseudo-package,
*and* they must have one of these "kind" tags:

  - android.system.imeswitcher (IME switcher, needed by SUW)
  - android.system.update (OTAs)

Note that OTAs currently use a fullScreenIntent, so they
bypass this logic anyway, but for consistency's sake we now
allow OTA icons in the status bar explicitly.

Bug: 6645469
Change-Id: Ib2e2f22d7a0817a1acaf8137ed4f3c7d3ddf8af5
2012-06-14 16:10:13 -04:00
Eric Fischer
97c11fe325 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-14 12:20:40 -07:00
Eric Fischer
f9de23bad3 Import translations. DO NOT MERGE
Change-Id: I561c60ea1ff93ae79414331242232bccfc820679
2012-06-14 12:10:43 -07:00
Michael Jurka
b9a38c57fc Tweak recents launch app animation
- Sometimes the black background would flash; changing
animation durations to make this much less likely
- Fixing issue in Recents where we sometimes forgot
to disable drawing caches on views after enabling them
2012-06-14 11:57:50 -07:00