79317 Commits

Author SHA1 Message Date
Svetoslav Ganov
0a79d2fbcd am dce5af63: Merge "Fix GlowPadView accessibility behavior." into jb-dev
* commit 'dce5af632ce8899905fbf187b9505f6753d5a562':
  Fix GlowPadView accessibility behavior.
2012-06-20 16:55:07 -07:00
Svetoslav Ganov
dce5af632c Merge "Fix GlowPadView accessibility behavior." into jb-dev 2012-06-20 16:52:16 -07:00
Jean-Michel Trivi
e44440f40c am bd6b1820: Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev
* commit 'bd6b1820d931ef11fc7fc5b8571a8265c1ed4994':
  Unhide new API in android.media.MediaRouter for remote playback
2012-06-20 16:43:55 -07:00
Jean-Michel Trivi
7fe75d9759 am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-dev
* commit 'fc178e381d3db299901a96461122eb22a4ffb43e':
  Asynchronous handling of remote volume updates
2012-06-20 16:43:52 -07:00
Jean-Michel Trivi
bd6b1820d9 Merge "Unhide new API in android.media.MediaRouter for remote playback" into jb-dev 2012-06-20 16:41:44 -07:00
Jean-Michel Trivi
fc178e381d Merge "Asynchronous handling of remote volume updates" into jb-dev 2012-06-20 16:41:25 -07:00
Amith Yamasani
1806afb2c4 am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev
* commit '998a68369fcf7928b6fa58d6312426f88a27a39e':
  Add a private method to retrieve the header list from PreferenceActivity
2012-06-20 15:48:27 -07:00
Amith Yamasani
998a68369f Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 2012-06-20 15:44:48 -07:00
Scott Main
90c2eea8d0 am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
* commit '59ea115def6ed7277f6f159e0670b5a37c3ca126':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
2012-06-20 14:59:04 -07:00
Scott Main
59ea115def Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738
docs: Remove side padding built into Design images to improve alignment.
a few HTML adjustments for alignment as well

Change-Id: I432e25128a90b0376a2a469859b0ad49b035a2df
2012-06-20 14:50:55 -07:00
Jean-Michel Trivi
2cd5d25378 Unhide new API in android.media.MediaRouter for remote playback
Expose new functionality for handling remote volume in:
 android.media.MediaRouter.RouteInfo
 android.media.MediaRouter.UserRouteInfo
 android.media.MediaRouter.VolumeCallback

Change-Id: I8fd9c92be606364599e65939f318e11c2860bab9
2012-06-20 14:36:23 -07:00
Amith Yamasani
423d48bbba Add a private method to retrieve the header list from PreferenceActivity
This is required by Settings app to be able to update the header list
if the accounts list changed.

Bug: 6685701
Change-Id: If27f83ec86fe1f3519a6e25de4e4fe4864133dc8
2012-06-20 13:54:53 -07:00
Jean-Michel Trivi
f98de1e8dd Asynchronous handling of remote volume updates
Remote playback information updates will be posted from the
 application thread, and sent to AudioService. Because they
 require locking the stack containing the remote playback
 information, the update should happen on AudioService's handler
 thread to avoid lock contention.

Change-Id: Ie04898295e08c16dd8ab5985fd825301e9cf1981
2012-06-20 13:40:22 -07:00
Mathias Agopian
8b38953926 am 06c93386: Merge "Exit boot animation cleanly." into jb-dev
* commit '06c93386374de3812629908f21c057a8d60c4b12':
  Exit boot animation cleanly.
2012-06-20 13:37:13 -07:00
Mathias Agopian
06c9338637 Merge "Exit boot animation cleanly." into jb-dev 2012-06-20 13:33:06 -07:00
alanv
78bfb98295 Fix GlowPadView accessibility behavior.
Bug: 6702412
Change-Id: If5ab75e77b0090a405004c66da0083e81d59deb4
2012-06-20 13:22:45 -07:00
satok
3a9ff158fe am 56802678: Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev
* commit '56802678a72157675382910e37857cf78e1cefcb':
  Workaround: Never reset the default IME if the system is not ready
2012-06-20 13:03:14 -07:00
satok
56802678a7 Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev 2012-06-20 13:01:09 -07:00
Ying Wang
7ea4979835 am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit 'edc34cf55482faa25b48e867bd51ecec74dbd0e8':
  Import translations. DO NOT MERGE
2012-06-20 12:28:33 -07:00
Ying Wang
edc34cf554 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 12:26:14 -07:00
Charles Chen
80a3c3ea6f am d0d3a850: Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev
* commit 'd0d3a850650ade52198e7836f87a0e27ad2d6b41':
  Fixing gesture recognition configuration in TouchExplorer.
2012-06-20 12:14:08 -07:00
Charles Chen
d0d3a85065 Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 2012-06-20 12:12:07 -07:00
Dianne Hackborn
b0222bb19e am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev
* commit '0fa4d30b03c4307ca5d461aa4450b672b6850ea1':
  Fix issue #6686339: 2 taps required to launch notification...
2012-06-20 12:08:03 -07:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
2012-06-20 12:08:00 -07:00
Dianne Hackborn
0fa4d30b03 Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 2012-06-20 12:06:38 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Peter Ng
61e7b87e8d am 2c24de30: Fixing typography typo and iconography typo
* commit '2c24de30a73b59ca1fa93cf7bfb7aba90953a0dc':
  Fixing typography typo and iconography typo
2012-06-20 11:59:36 -07:00
Ying Wang
ddaeed3615 Import translations. DO NOT MERGE
Change-Id: If50ab67d8bc4570a07cb2e9dba0c22ed4f7d7592
2012-06-20 11:58:21 -07:00
satok
4c0e7152e7 Workaround: Never reset the default IME if the system is not ready
Bug: 6685037
Change-Id: Ifb311f85154beadd4787ec73669bedfdf1f5172d
2012-06-21 02:22:24 +09:00
Peter Ng
2c24de30a7 Fixing typography typo and iconography typo
Bug: 5836343
Bug: 5831156
Change-Id: I2801002a20645d1cbf7d548a1a7c280796457adb
2012-06-20 09:33:39 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
18ddb6ce6f Merge "Remote volume handling in MediaRouter" into jb-dev 2012-06-20 09:07:59 -07:00
The Android Open Source Project
eb47f9c81d Reconcile with jb-release
Change-Id: I6743fa9d2193a3c89f14c6157ef0e783474b0477
2012-06-20 08:25:40 -07:00
The Android Automerger
f90c0a8869 merge in jb-release history after reset to jb-dev 2012-06-20 07:02:31 -07:00
Luca Zanolin
50ff53be52 am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev
* commit '17c1425f5ab5c6f734a700d74b5bd8118f289cd5':
  Clone the list of listeners before notifing any event.
2012-06-20 02:34:33 -07:00
Luca Zanolin
17c1425f5a Merge "Clone the list of listeners before notifing any event." into jb-dev 2012-06-20 02:32:12 -07:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
2012-06-19 19:41:35 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
2012-06-19 19:20:05 -07:00
Adam Powell
2dde147b28 Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 2012-06-19 19:18:34 -07:00
Romain Guy
b56fe8abf6 am f96d117e: Merge "Add extra systrace tracing" into jb-dev
* commit 'f96d117e9bf2d5998677521330697628c95ec3f1':
  Add extra systrace tracing
2012-06-19 18:40:50 -07:00
Romain Guy
f96d117e9b Merge "Add extra systrace tracing" into jb-dev 2012-06-19 18:39:08 -07:00
Jim Miller
27d1916e85 am fce2ec4d: Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev
* commit 'fce2ec4da468c2d5ba26de8d051ff7ee64bb01c3':
  Fix 6656710: center dot pattern in GlowPadView
2012-06-19 18:33:27 -07:00
Jim Miller
fce2ec4da4 Merge "Fix 6656710: center dot pattern in GlowPadView" into jb-dev 2012-06-19 18:31:31 -07:00
Jim Miller
94754ef36d Fix 6656710: center dot pattern in GlowPadView
This fixes a bug where the dots weren't aligned with the center of the view.
The matrix should not contain the offset of the image itself since we really
want to scale about the abstract points.  The code now subtracts the image
centering positions (cx,cy) from the point to be scaled.

Change-Id: I1d46a5d51b1fd1d39944c64baf86c306c2d5e923
2012-06-19 18:28:25 -07:00
Romain Guy
77e67cf905 Add extra systrace tracing
This change shows how much time is spent updating and executing
framework display lists within a frame.
This change also fixes a crash that happnes if you attempt to
perform a dumpsys gfxinfo while the app is drawing (we are telling
developers to use this new tool.)

Change-Id: Ia4047a78a42b545ab77176ef4f371c300686548c
2012-06-19 18:21:06 -07:00
Xavier Ducrohet
58a8d8d2d4 am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-dev
* commit '0e302bc884fa4b25eb391d625f2fb0eddc25d9b7':
  Disable debug output in SDK layoutlib.
2012-06-19 18:06:37 -07:00
Xavier Ducrohet
0e302bc884 Merge "Disable debug output in SDK layoutlib." into jb-dev 2012-06-19 18:04:19 -07:00
Xavier Ducrohet
4d7f301f94 Disable debug output in SDK layoutlib.
Bug: 6697442

Change-Id: I9741761342ea220c158aa124089430b0db80bf7e
2012-06-19 18:02:21 -07:00
Dianne Hackborn
6e2281d44c Fix issue #6686339: 2 taps required to launch notification...
...or settings from lock screen

When a window is drawn, the code to determine whether it should now
be shown was calling WindowState.isReadyForDisplay().  Part of the
condition of this function is that it is not ready if a policy is
forcing the window to be hidden -- which is the case when the lock
screen is shown.  As a result, we wouldn't show the window at that
point, so wouldn't tell the activity manager that the token's windows
are visibible, and wouldn't tell the lock screen to go away.

This adds a new variation WindowState.isReadyForDisplayIgnoringKeyguard(),
which is the same as the original method but ignores the policy visibility
for app windows.  This allows windows to be go through the complete
path of handling when the window is finally drawn and telling the
activity manager about it, even if behind the lock screen.  By making it
a separate function, we don't impact any other code that is calling the
old function and may be relying on its behavior.

Also cleaned up a little of the dumpsys output.  Most important, the
new ANR section is now moved to the top, since we want
"adb shell dumpsys window" to still give a nice summary of what we
normally care about -- the window stack and important global state.

Change-Id: Ica3ea85ce46f3f5f5cd2cc30fbd9de13d3885a57
2012-06-19 17:54:24 -07:00
Adam Powell
849df0b5a7 Add an XML attribute for controlling which route types a
MediaRouteButton in a layout will alter.

Change-Id: I897a68188fa87e4c2dbc88794117a3ef87ffaab0
2012-06-19 17:47:48 -07:00