79113 Commits

Author SHA1 Message Date
Kenny Root
535d3b3f33 am 0cf34218: Merge "Adding test cases for getInstalledPackages"
* commit '0cf342184e030ee6f65d87eeba48484725910a8b':
  Adding test cases for getInstalledPackages
2012-06-15 16:43:29 -07:00
Kenny Root
0cf342184e Merge "Adding test cases for getInstalledPackages" 2012-06-15 16:22:36 -07:00
Adam Powell
15635728a4 am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
  Update MediaRouteChooserDialog grouping UI
2012-06-15 11:54:42 -07:00
Adam Powell
27db797e37 Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 2012-06-15 11:52:10 -07:00
Daniel Sandler
c82a664ca3 am 708f0739: Merge "Hide "no internet connection" when connected some other way." into jb-dev
* commit '708f0739a54c2505921df4366a3ae301ba1edb20':
  Hide "no internet connection" when connected some other way.
2012-06-15 11:49:46 -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
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
Jean-Baptiste Queru
a310500f6c am 2dd63ccd: am d8ccd712: Merge "Parcel compRequired flag correctly."
* commit '2dd63ccdb0e4109d03c51a002ff785c9d8a8ccb9':
  Parcel compRequired flag correctly.
2012-06-15 10:13:31 -07:00
Jean-Baptiste Queru
2dd63ccdb0 am d8ccd712: Merge "Parcel compRequired flag correctly."
* commit 'd8ccd712dac9e8f4e8068b02f5ca55b014de831a':
  Parcel compRequired flag correctly.
2012-06-15 10:10:50 -07:00
Jean-Baptiste Queru
d8ccd712da Merge "Parcel compRequired flag correctly." 2012-06-15 10:02:58 -07:00
Justin Ho
f103e8bbe4 am 137bfad2: Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev
* commit '137bfad24f26fb3526329aadfe02d751e87027b5':
  Jelly Bean ringtone Bug: 6619980
2012-06-15 09:25:34 -07:00
Justin Ho
137bfad24f Merge "Jelly Bean ringtone Bug: 6619980" into jb-dev 2012-06-15 09:23:25 -07:00
Daniel Sandler
02a56e1696 am 2fc45503: Merge "Concatenate SPN and PLMN with a pipe." into jb-dev
* commit '2fc45503dd653095c0476146e5560d13bb968975':
  Concatenate SPN and PLMN with a pipe.
2012-06-15 09:19:34 -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
4879c1e8b3 am 734f0214: Merge "Help out issue #6654729: CAB + screen off during playback" into jb-dev
* commit '734f0214ec04e6c734aeec78d15f6db478cfb55c':
  Help out issue #6654729: CAB + screen off during playback
2012-06-14 21:35:55 -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
655410e7b3 am 5c74bca4: Merge "Synthesize fake vsyncs when the screen is off." into jb-dev
* commit '5c74bca49a48c3316aca9fed00d287cb8cbc2be4':
  Synthesize fake vsyncs when the screen is off.
2012-06-14 21:32:36 -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
8607127d8b am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev
* commit '839734bbe502c876237a0473823b606803051825':
  Handle ENITR failure for Headset control channel.
2012-06-14 20:31:15 -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
0d732fe68c am 0e44a6be: Merge "Don\'t finish noHistory="true" activities behind the lock screen" into jb-dev
* commit '0e44a6beeae8a17e81145b83f2dfb8f719d41f52':
  Don't finish noHistory="true" activities behind the lock screen
2012-06-14 19:37:45 -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
13b5c194e1 am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev
* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter
2012-06-14 17:58:05 -07:00
Adam Powell
90b9f84c43 Merge "API updates for MediaRouter" into jb-dev 2012-06-14 17:51:27 -07:00
Christopher Tate
5eed873f10 am 7661bc6c: Merge "Run the screen on/off broadcasts at foreground priority" into jb-dev
* commit '7661bc6c5afef4cca8ccee2f859906f8fb64087b':
  Run the screen on/off broadcasts at foreground priority
2012-06-14 17:37:05 -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
42fb511f1b am 2657a59f: Merge "Add support for NEXT_HTML_ELEMENT to WebViewClassic." into jb-dev
* commit '2657a59f54e316ca11d7d9adf648e7001960f469':
  Add support for NEXT_HTML_ELEMENT to WebViewClassic.
2012-06-14 17:22:24 -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
33dea30bf0 am 0777558f: Merge "DO NOT MERGE Respect the "Make password visible" setting." into jb-dev
* commit '0777558f0365d8020693109118bd92994b0ec8b1':
  DO NOT MERGE Respect the "Make password visible" setting.
2012-06-14 16:16:07 -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
8ce090d936 am 68a808bc: Merge "Show even fewer notifications in Setup." into jb-dev
* commit '68a808bc702f03536bd0cf3e2556127e364119d6':
  Show even fewer notifications in Setup.
2012-06-14 16:09:30 -07:00
Daniel Sandler
68a808bc70 Merge "Show even fewer notifications in Setup." into jb-dev 2012-06-14 16:07:45 -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
b6b2af3cd1 am 9add5654: Merge "AccessibilityInjector should return false on a failed action." into jb-dev
* commit '9add56546b1a5ddbf54f058f2ddb807a0ca02dff':
  AccessibilityInjector should return false on a failed action.
2012-06-14 15:16:54 -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
de90d67b2f am 8b9c6d51: Merge "Expose apps when keyguard animating." into jb-dev
* commit '8b9c6d51d59898375089e9708325604c227812e0':
  Expose apps when keyguard animating.
2012-06-14 14:57:31 -07:00
Craig Mautner
8b9c6d51d5 Merge "Expose apps when keyguard animating." into jb-dev 2012-06-14 14:55:19 -07:00
Michael Jurka
2e820417d6 am a676cdab: Merge "Tweak recents launch app animation" into jb-dev
* commit 'a676cdab11ace948a054b5ca342727a3d0eb29b2':
  Tweak recents launch app animation
2012-06-14 14:46:38 -07:00
Romain Guy
06116b08da am a989b334: Merge "Don\'t create a giant layer for all notifications Bug #6642475" into jb-dev
* commit 'a989b334fd097114ce1016ce1668597a213a441c':
  Don't create a giant layer for all notifications Bug #6642475
2012-06-14 14:46:35 -07:00
Eino-Ville Talvala
fb1ff69979 am d2ee4960: Merge "Remove Disco video from builds." into jb-dev
* commit 'd2ee4960c492259665adc2c6630e1a59642677b9':
  Remove Disco video from builds.
2012-06-14 14:46:26 -07:00