79381 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
Svetoslav Ganov
4cb3b76caa Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev 2012-06-18 10:20:42 -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
Daniel Sandler
7a1a406b24 Turn off debug logs.
Also switch to Slog, which is more appropriate for framework
logging.

Bug: 6684167
Change-Id: I829de86702a9952ce42ec9967c8d493529253426
2012-06-18 11:26:43 -04:00
Justin Ho
1c1ece1bd2 Merge "Increasing brightness for notification icons and navigation bar icons Bug: 6612414" into jb-dev 2012-06-18 07:29:02 -07:00
The Android Automerger
29b39793fc merge in jb-release history after reset to jb-dev 2012-06-18 07:02:04 -07:00
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
dd7236db73 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 17:06:48 -07:00
Jeff Brown
e182d8905f 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 17:06:47 -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
Svetoslav Ganov
45a02e0809 API for finding accessibility focus in virtual tree not needed.
1. The function for finding where the accessibility focus in a virtual
   node tree presented by an AccessibilityNodeProvider is not needed
   API since the framework already keeps track of the accessibility
   focused virtual node in order to draw the focus rectangle. This API
   adds unnecessary complexity to developers of AccessibilityNodeProviders.

bug:6675330

Change-Id: I84774686b06a995073a39e45b8ef22f2cd04b773
2012-06-17 15:07:38 -07:00
The Android Automerger
45a9c67c6d merge in jb-release history after reset to jb-dev 2012-06-17 07:02:45 -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
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
The Android Automerger
ea562f6fad merge in jb-release history after reset to jb-dev 2012-06-16 07:02:55 -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
Christian Robertson
9345b12b65 Increasing brightness for notification icons and navigation bar icons
Bug: 6612414

Change-Id: I5ab60f60f5bf502b3b15c30207047285db611ae3
2012-06-15 19:36:30 -07:00
alanv
eebebc9ff6 Ensure WebViewClassic calls super.onHoverEvent()
Bug: 6679763
Change-Id: I9b182f25fa1c4050ea3a046c896e82ffbb4651ad
2012-06-15 18:59:11 -07:00
Jim Miller
20039ad17b Fix 6665117: ACTION_ASSIST visual improvements
- add generic icon for search providers that don't supply one
- change alpha weighting factor for glow
- don't show ring background

Change-Id: I86c86dc2d623c25ec7b91e206fac8ad9cd60faac
2012-06-15 18:11:00 -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
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
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
Gilles Debunne
cd943a7a01 Fixed text rendering issue with spans.
Bug 6598784

The algorithm uses three imbricated loops:
- paragraphs
- span regions (called "blocks" in that description) in these
- characters in these

We can ignore the paragraphs and assume paraStart==0.

The span region loop cuts the text into blocks of text which share
the same set of MetricAffectingSpan spans applied to them. Note that
spanStart and spanEnd represent such a range, and not necessarily an
actual span range.

The third loop then iterates over the characters of these blocks, and creates
a new line (calling out() as soon as the width has been reached.

The core of the problem comes from the 'nextSpanStart' variable.
It is used to restart the block loop from a previous position in case
a line has been created that does not intersect with the current block.

However, in case the current block is larger than the width of the text,
the character loop is going to create other lines of text before we exit the
j-loop. Going back to the block loop, we reset spanStart to the nextSpanStart,
which may be too far back in the text. As a result, the same range of characters
is measured again.

The (spanStart == spanEnd) test was used to handle the case where
nextSpanStart was indeed assigned to a value different than spanEnd.

This fix simplifies this logic and removes the nextSpanStart variable:

When the created line ends before the current block (here < spanStart), we
immediately exit the character loop, re-starting the block loop from the
current position.

Patch 4: added a fix in measured to handle overlapping character ranges.

Change-Id: Ie71b3cf4018b332e335ea916fef08acb43a6679e
2012-06-15 15:29:13 -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
d16c8cf1f2 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 14:12:10 -07:00
Justin Ho
7a6f77670b Jelly Bean ringtone
Bug: 6619980

Change-Id: I717c66274d3efaafb0caa60204d311732c182268
2012-06-15 14:12:09 -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