79134 Commits

Author SHA1 Message Date
Ying Wang
4f36ed500f am 2f8ee744: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '2f8ee7448d6a47178802f9bf00d9e1403b7e7ef9':
  Import translations. DO NOT MERGE
2012-06-18 10:31:47 -07:00
Dianne Hackborn
acae5bd349 am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
* commit '87959cdd8560e743956a71bb687799e94053e086':
  Add new callback for MediaRouter to found out about device changes.
2012-06-18 10:31:29 -07:00
Eric Laurent
9686f24ce3 am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
* commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed':
  AudioManager: back to old setBluetoothA2dpOn()
2012-06-18 10:31:22 -07:00
Teng-Hui Zhu
c1d3b23b54 am 2075f2d3: Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
* commit '2075f2d3e486b565c9abd2556d81dfb1449f6efb':
  Notify Java side to start when transition into full screen mode without a reload.
2012-06-18 10:31:16 -07:00
Dianne Hackborn
99e33bf14b am 17b9cec1: Merge "Fix issue #6636731: Mariner animation ring gets stuck" into jb-dev
* commit '17b9cec1b6fedd0e54ff61f5a12f0e515add70ab':
  Fix issue #6636731: Mariner animation ring gets stuck
2012-06-18 10:31:05 -07:00
Kenny Root
33ef4ee712 resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp
Change-Id: Id1b1847a3ab5c0f51ac8a732fce5ba12e5810259
2012-06-18 10:26:36 -07:00
Jean-Baptiste Queru
98e955d295 am 20d6caf8: Merge "Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset()."
* commit '20d6caf8888d4114b6ce79d93c7c9cf903ad8c22':
  Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset().
2012-06-18 09:23:55 -07:00
Jean-Baptiste Queru
20d6caf888 Merge "Fix issue #13366. Take account of stackFromBottom in computeVerticalScrollOffset()." 2012-06-18 08:53:18 -07:00
Pieter-Jan Vandormael
bbf7b4cdcf Fix issue #13366. Take account of stackFromBottom in
computeVerticalScrollOffset().

Change-Id: I743708ef1ac05e358840f37010de36b7d0c6a346
Signed-off-by: Pieter-Jan Vandormael <ezelspinguin@gmail.com>
2012-06-16 17:11:54 +02:00
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
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
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
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
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
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