Jim Miller
048311ca37
am a10b1a73: am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
...
* commit 'a10b1a738dfa8fcf094fec555e7d85dba179f5fc':
Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:34:59 -07:00
Jim Miller
a10b1a738d
am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
...
* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
Fix 6665117: ACTION_ASSIST visual improvements
2012-06-18 13:32:05 -07:00
Jim Miller
12da2c5eee
Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev
2012-06-18 13:29:49 -07:00
Scott Anderson
fce27d8edd
Merge "Clean up IntToStrings for window TYPE_*"
2012-06-18 12:57:05 -07:00
George Mount
3281c38ec4
Broaden allowed selection criteria so selection doesn't disappear.
...
Bug 6675572
Change-Id: Ic69caac431539247d440c6bac08a3038e8641e99
2012-06-18 11:34:41 -07:00
Svetoslav Ganov
c32b2091d6
am 45c4a8df: am ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
...
* commit '45c4a8df9487f53af37ded1f5a1ebe500e89b493':
API for finding accessibility focus in virtual tree not needed.
2012-06-18 11:33:33 -07:00
Svetoslav Ganov
45c4a8df94
am ec7c7ebf: Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
...
* commit 'ec7c7ebf01121d17f7a12e827bd77c024eab54e8':
API for finding accessibility focus in virtual tree not needed.
2012-06-18 11:30:09 -07:00
Svetoslav Ganov
ec7c7ebf01
Merge "API for finding accessibility focus in virtual tree not needed." into jb-dev
2012-06-18 11:27:44 -07:00
Svetoslav Ganov
ce252553fd
am 05fa21fa: am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
...
* commit '05fa21fa77962d302b040f66a1785e0dd84f3e0a':
Ensure WebViewClassic calls super.onHoverEvent()
2012-06-18 10:50:08 -07:00
Adam Powell
0be17da620
am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
...
* commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4':
Volume control in MediaRouter dialogs
2012-06-18 10:49:56 -07:00
Adam Powell
9471faf5dc
am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
...
* commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb':
Make MediaRouter UI more robust around route count changes
2012-06-18 10:49:53 -07:00
Jeff Brown
91a5f4bef5
am 79476980: am d7a04de1: Capture window manager\'s last ANR state in bug report.
...
* commit '7947698096d4b09bb0f662fdca89cfa5d475743e':
Capture window manager's last ANR state in bug report.
2012-06-18 10:49:50 -07:00
Makoto Onuki
9b6f53c544
am df6d3eeb: am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev
...
* commit 'df6d3eebbaa8c0b3cb41aec44b9e212f2d4cdb1a':
Allow restricting the scope of a phone-filter search
2012-06-18 10:49:44 -07:00
Adam Powell
7e8aac14c3
am bb20575f: am 130b4572: ActionProvider API update
...
* commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
ActionProvider API update
2012-06-18 10:49:41 -07:00
Adam Powell
00b7ae0936
am 772ddc0c: am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
...
* commit '772ddc0cf28625964435edc5e86048e353c425fa':
Remove workaround for bug that was fixed a while ago.
2012-06-18 10:49:35 -07:00
Jeff Brown
a2f0fc1e68
am 4440d158: am 5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
...
* commit '4440d158b88f948ced442797baffad35743406af':
Revert "Synthesize fake vsyncs when the screen is off."
2012-06-18 10:49:32 -07:00
Svetoslav Ganov
041982bf50
am 11832db4: am 531d5866: Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
...
* commit '11832db437d04d71dec9a78382138b2dd6518e37':
Accessibility focus search and setting it from hover are performed by the client.
2012-06-18 10:49:25 -07:00
Teng-Hui Zhu
eaef0d8bb5
am c1d3b23b: am 2075f2d3: Merge "Notify Java side to start when transition into full screen mode without a reload." into jb-dev
...
* commit 'c1d3b23b54bb044bc2fbff83f1a3816b3a0f276b':
Notify Java side to start when transition into full screen mode without a reload.
2012-06-18 10:49:09 -07:00
George Mount
b90ed58f61
Merge "Don't rely on focus change to detect edit-type selection."
2012-06-18 10:39:57 -07:00
Svetoslav Ganov
05fa21fa77
am 4cb3b76c: Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
...
* commit '4cb3b76caa004867bac43f0001072e24bfa8c120':
Ensure WebViewClassic calls super.onHoverEvent()
2012-06-18 10:36:12 -07:00
Adam Powell
c92aa2e7c9
am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev
...
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
Volume control in MediaRouter dialogs
2012-06-18 10:34:32 -07:00
Adam Powell
8f695c525f
am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev
...
* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
Make MediaRouter UI more robust around route count changes
2012-06-18 10:34:29 -07:00
Jeff Brown
7947698096
am d7a04de1: Capture window manager\'s last ANR state in bug report.
...
* commit 'd7a04de16798acc04ec0a89a0c7d9f1cf60d1521':
Capture window manager's last ANR state in bug report.
2012-06-18 10:34:25 -07:00
Makoto Onuki
df6d3eebba
am c4637d3e: Merge "Allow restricting the scope of a phone-filter search" into jb-dev
...
* commit 'c4637d3efbbeb3e204691da96c357b5fea4ae2f1':
Allow restricting the scope of a phone-filter search
2012-06-18 10:33:45 -07:00
Adam Powell
bb20575f85
am 130b4572: ActionProvider API update
...
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
ActionProvider API update
2012-06-18 10:33:19 -07:00
Adam Powell
772ddc0cf2
am fd4df469: Merge "Remove workaround for bug that was fixed a while ago." into jb-dev
...
* commit 'fd4df46917c79067416985ac53a3da6b27e8c333':
Remove workaround for bug that was fixed a while ago.
2012-06-18 10:32:46 -07:00
Jeff Brown
4440d158b8
am 5aa02e20: Merge "Revert "Synthesize fake vsyncs when the screen is off."" into jb-dev
...
* commit '5aa02e20186a9e30553a8ef0d53d5fad4c0b7597':
Revert "Synthesize fake vsyncs when the screen is off."
2012-06-18 10:32:39 -07:00
Svetoslav Ganov
11832db437
am 531d5866: Merge "Accessibility focus search and setting it from hover are performed by the client." into jb-dev
...
* commit '531d5866d8e2529e2ae1c6ef12202119753bec03':
Accessibility focus search and setting it from hover are performed by the client.
2012-06-18 10:32:16 -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
Svetoslav Ganov
4cb3b76caa
Merge "Ensure WebViewClassic calls super.onHoverEvent()" into jb-dev
2012-06-18 10:20:42 -07:00
Jean-Baptiste Queru
fce51d5873
am 98e955d2: am 20d6caf8: Merge "Fix issue #13366 . Take account of stackFromBottom in computeVerticalScrollOffset()."
...
* commit '98e955d295441636ba19688e18a8223691256d2c':
Fix issue #13366 . Take account of stackFromBottom in computeVerticalScrollOffset().
2012-06-18 09:27:53 -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
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
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
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
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
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
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
Nick Pelly
10c45b6965
Merge "Include WIFI scan's in Battery Stats."
2012-06-15 16:55:41 -07:00
Nick Pelly
6ccaa540a1
Include WIFI scan's in Battery Stats.
...
Call noteWifiScanStartedFromSource() when a scan is started.
Call noteWifiScanStoppedFromSource() when a scan is finished.
The current implementation tracks to UID that requested the scan, and
correctly tracks the duration of the scan. It ignores scan requests
that occur when a scan is already in progress. It does not distinguish
between active and passive scans.
Repurpose all the noteScanWifiLockAcquired/Released() plumbing
for WIFI scan tracking. The WIFI scan locks were never reported
to the user. Use noteFullWifiLock() when WIFI scan locks are used -
this makes sense because the power draw for a WIFI scan lock
should be about the same as for a full WIFI lock.
Bug: 6642581
Change-Id: Ida6e87992853698545b89f875c973a239218317d
2012-06-15 16:10:38 -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
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