Jeff Brown
96d8149fc8
am 23b15320: am 22aa5120: Capture input dispatcher\'s last ANR state in bug report.
...
* commit '23b15320ec57f49cb8e87210e37bcd4b146cb204':
Capture input dispatcher's last ANR state in bug report.
2012-06-18 10:49:47 -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
Dianne Hackborn
d466fe463b
am 60860192: am d8bbf96a: Merge "Fix issue #6664140 : Time to lock should work even Stay awake..." into jb-dev
...
* commit '608601924651531210ad3c6179d02c471f42dddf':
Fix issue #6664140 : Time to lock should work even Stay awake...
2012-06-18 10:49:38 -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
Jim Miller
47add3e558
am 5250db0b: am b06be57f: Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev
...
* commit '5250db0bfd18aacbb6406212a84e3dd101e547e6':
Fix 6507787: fix MMI PUK unlock procedure
2012-06-18 10:49:28 -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
Ying Wang
23b437d338
am d18d623f: (-s ours) am c1568fea: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'd18d623fe95ccf1c8aace064d0fcdd2818c19578':
Import translations. DO NOT MERGE
2012-06-18 10:49:22 -07:00
Ying Wang
d7dddbd7ce
am 4f36ed50: (-s ours) am 2f8ee744: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '4f36ed500f975e1be1dd1246707db60332eaa374':
Import translations. DO NOT MERGE
2012-06-18 10:49:20 -07:00
Dianne Hackborn
5ded10982c
am acae5bd3: am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev
...
* commit 'acae5bd34923a79115ad24687558a6ab2ce780ec':
Add new callback for MediaRouter to found out about device changes.
2012-06-18 10:49:15 -07:00
Eric Laurent
2c0044410e
am 9686f24c: am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev
...
* commit '9686f24ce3d13446393a468fb3f52283bf2bc80d':
AudioManager: back to old setBluetoothA2dpOn()
2012-06-18 10:49:12 -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
Dianne Hackborn
468a0051eb
am 99e33bf1: am 17b9cec1: Merge "Fix issue #6636731 : Mariner animation ring gets stuck" into jb-dev
...
* commit '99e33bf14b2be799efe02b9a8a42b25abc0fced3':
Fix issue #6636731 : Mariner animation ring gets stuck
2012-06-18 10:49:06 -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
Justin Ho
32cd40e604
am 1c1ece1b: Merge "Increasing brightness for notification icons and navigation bar icons Bug: 6612414" into jb-dev
...
* commit '1c1ece1bd2ecfa6eacd1a1de8f529e81415f165d':
Increasing brightness for notification icons and navigation bar icons Bug: 6612414
2012-06-18 10:35:37 -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
Jeff Brown
23b15320ec
am 22aa5120: Capture input dispatcher\'s last ANR state in bug report.
...
* commit '22aa51202652efbd55094217a046b8e5ecb7afe2':
Capture input dispatcher's last ANR state in bug report.
2012-06-18 10:34:21 -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
Dianne Hackborn
6086019246
am d8bbf96a: Merge "Fix issue #6664140 : Time to lock should work even Stay awake..." into jb-dev
...
* commit 'd8bbf96a84cba7c31fa1535fe2467520f2aa0198':
Fix issue #6664140 : Time to lock should work even Stay awake...
2012-06-18 10:33:05 -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
Jim Miller
5250db0bfd
am b06be57f: Merge "Fix 6507787: fix MMI PUK unlock procedure" into jb-dev
...
* commit 'b06be57f0acf8bb7b8c1767604058c8f061a7b8b':
Fix 6507787: fix MMI PUK unlock procedure
2012-06-18 10:32:29 -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
Ying Wang
d18d623fe9
am c1568fea: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit 'c1568feaba9f3c4b9f0fab5fcdf062ecb922fcaa':
Import translations. DO NOT MERGE
2012-06-18 10:31:51 -07:00
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
Kenny Root
15a00bfead
am 33ef4ee7: resolved conflicts for merge of 4de60b26 to jb-dev-plus-aosp
...
* commit '33ef4ee71277888304a3c67fdd8dfddd728b4c88':
Make lib dir before changing ownership of app dir
2012-06-18 10:31:28 -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
Craig Mautner
01cd0e7df0
More steps to isolate animation.
...
- Create class to transfer state from WindowAnimator to
WindowManagerService.
- Detached wallpaper state was shared between the two classes. This
CL isolates it.
Change-Id: I7bcee348bf9f9f8f0228f36c53d75e5c92fd84cb
2012-06-18 10:19:11 -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
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