Michael Jurka
8c3ce3b6ca
am cf6e1455: am 71fc205d: Merge "Change snap behavior for lock screen" into jb-dev
...
* commit 'cf6e14558f693ae215d5030ce562a649b4cb973f':
Change snap behavior for lock screen
2012-06-14 11:47:58 -07:00
Jason Simmons
1d28fef92e
Stop any running DHCP client before bringup up an Ethernet interface
...
If the system server is restarted, the dhcpcd_eth0 service may have already
been started by the previous system server, and the new system server's
attempts to start the dhcpcd will do nothing.
Change-Id: Icfd480a5369eb9c7dfe86b43190294871a915529
2012-06-14 11:44:09 -07:00
Matthew Xie
61c0fc41e1
DO NOT MERGE - cherry pick a Bluetooth property fix from master
...
Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn.
When we fail to get the property, print out warning message, turn
Discoverable off.
Bug 6302990
Change-Id: Ie21aa2a89050c74d99d9ee521a95ffa822114757
2012-06-14 11:44:06 -07:00
Michael Jurka
cf6e14558f
am 71fc205d: Merge "Change snap behavior for lock screen" into jb-dev
...
* commit '71fc205d11490872927e279c4a0cfa3176b15f20':
Change snap behavior for lock screen
2012-06-14 11:41:55 -07:00
Jeff Brown
2c89d171fa
am fc959a38: am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
...
* commit 'fc959a389564f2ffef9c4ceba0b1ff119dd53933':
Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:40:10 -07:00
Michael Jurka
71fc205d11
Merge "Change snap behavior for lock screen" into jb-dev
2012-06-14 11:39:21 -07:00
Adam Powell
a587b449c4
am 0f03d771: am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
...
* commit '0f03d771b29ff0fc6919a514c56128de9a5ecd5e':
Support route grouping in the MediaRouter dialog UI.
2012-06-14 11:34:17 -07:00
Jeff Brown
fc959a3895
am 9e197141: Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
...
* commit '9e197141f8249e36d3f19aeda332ae40dac7da05':
Add new ASSIST key and map it to the global assist intent.
2012-06-14 11:33:31 -07:00
Jeff Brown
9e197141f8
Merge "Add new ASSIST key and map it to the global assist intent." into jb-dev
2012-06-14 11:28:52 -07:00
Adam Powell
0f03d771b2
am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
...
* commit 'f9b7f9f5080100043df3c8868bca4df84becf5a1':
Support route grouping in the MediaRouter dialog UI.
2012-06-14 11:28:37 -07:00
Adam Powell
f9b7f9f508
Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev
2012-06-14 11:25:20 -07:00
Fabrice Di Meglio
7fbede44ed
am 99745c01: am 15c9c614: Merge "Fix bug #6661824 Hebrew Text can be clipped" into jb-dev
...
* commit '99745c01797c34ce7ca76640deab09fc728aee4e':
Fix bug #6661824 Hebrew Text can be clipped
2012-06-14 11:10:13 -07:00
Fabrice Di Meglio
99745c0179
am 15c9c614: Merge "Fix bug #6661824 Hebrew Text can be clipped" into jb-dev
...
* commit '15c9c6141a00cd91290928bce742a2ae6761aca2':
Fix bug #6661824 Hebrew Text can be clipped
2012-06-14 11:05:25 -07:00
Michael Jurka
53f109bf49
Change snap behavior for lock screen
...
Use angle and distance from center, rather than
distance from target.
Change-Id: Ic970bc4b05d341dbb6aab334e3f630794f2a211c
2012-06-14 10:56:33 -07:00
Fabrice Di Meglio
15c9c6141a
Merge "Fix bug #6661824 Hebrew Text can be clipped" into jb-dev
2012-06-14 10:50:36 -07:00
Daniel Sandler
185951004e
am cb629f38: am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev
...
* commit 'cb629f38008ad4f48a956a8d74daa65eff351a75':
Remove line3 in big notification unless there's text to show.
2012-06-14 10:33:30 -07:00
John Reck
1cc2374f28
am d6bcfeb5: am d54d7cfe: Merge "Call WebView.performLongClick instead of performLongClick()" into jb-dev
...
* commit 'd6bcfeb5e9bd5d198d81d48bf817e7f028e4e384':
Call WebView.performLongClick instead of performLongClick()
2012-06-14 10:33:03 -07:00
Adam Powell
cf815b56bf
am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
...
* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
MediaRouter dialog
2012-06-14 10:32:49 -07:00
Winson Chung
58c35bbe34
Merge "Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)"
2012-06-14 10:30:34 -07:00
Jeff Brown
de7a8ead24
Add new ASSIST key and map it to the global assist intent.
...
Moved some duplicate code from SearchPanelView and LockScreen
over to SearchManager to avoid creating yet another copy of it
in PhoneWindowManager.
Bug: 6594275
Change-Id: Ib4ebcd6817639d17548952ab2ce7cb876c05777c
2012-06-14 04:16:26 -07:00
Adam Powell
d6d0bddee3
Support route grouping in the MediaRouter dialog UI.
...
Change-Id: Idcae12cedfb7ca13950e7fa45441fba2029a9f68
2012-06-13 23:27:09 -07:00
Svetoslav Ganov
d8058ca556
AccessibilityInjector should return false on a failed action.
...
1. AccessibilityInjector was returning true even if the underlying
JavaScript was not loaded/failed. This may lead to TalkBack getting
stuck in a web view. To avoid this TalkBack requires gran1ularity
change when getting into web view. This is neither advertised nor
shown in the tutorial and which is worse it is inconsistent with
the traversal of the app.
Now if the action fails, false is returned and also the timeout for
handling the action request is increased to 5s. Upon the completion
of this timeout TalkBack may decide to show a wait dialog or just
skip the web content. We are treating this as an ANR.
bug:6663344
Change-Id: Idf3d08fe928c495bb974a127f853de6f938e2f77
2012-06-13 20:26:48 -07:00
Daniel Sandler
cb629f3800
am 4365d066: Merge "Remove line3 in big notification unless there\'s text to show." into jb-dev
...
* commit '4365d066e8beed17b61ba51c728d60a9baa499be':
Remove line3 in big notification unless there's text to show.
2012-06-13 18:03:40 -07:00
Daniel Sandler
4365d066e8
Merge "Remove line3 in big notification unless there's text to show." into jb-dev
2012-06-13 18:00:56 -07:00
Fabrice Di Meglio
8d44fff7e6
Fix bug #6661824 Hebrew Text can be clipped
...
- use the correct ellipsis char in both measurement and rendered string
Change-Id: Ia00285fc16da528f18702719026503b5d0610642
2012-06-13 15:54:55 -07:00
Winson Chung
7fbd28438c
Updating AppWidgetHost to receive a callback when any appWidget has changed. (Bug 6602951)
...
Change-Id: I76d688b10ee7775b4ebe81259713f2aaf0009d05
2012-06-13 15:29:19 -07:00
John Reck
d6bcfeb5e9
am d54d7cfe: Merge "Call WebView.performLongClick instead of performLongClick()" into jb-dev
...
* commit 'd54d7cfec7bcfd4fa84dcf686071cc5e9b599522':
Call WebView.performLongClick instead of performLongClick()
2012-06-13 15:02:48 -07:00
John Reck
d54d7cfec7
Merge "Call WebView.performLongClick instead of performLongClick()" into jb-dev
2012-06-13 14:59:13 -07:00
Tsu Chiang Chuang
723118c9e1
Clean up host tests that have been moved to TF.
...
Change-Id: Iebadfc6aefeca18a944079a7e9115a3c53c211ce
2012-06-13 14:26:53 -07:00
Adam Powell
6c14359074
am 4b4a947b: Merge "MediaRouter dialog" into jb-dev
...
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
MediaRouter dialog
2012-06-13 14:05:24 -07:00
Adam Powell
4b4a947b5e
Merge "MediaRouter dialog" into jb-dev
2012-06-13 14:02:53 -07:00
Eric Fischer
cc7baa28f2
am 82134f76: Merge "Import translations. DO NOT MERGE" into jb-dev
...
* commit '82134f76936be049cc4b23a894ba7decc1d59952':
Import translations. DO NOT MERGE
2012-06-13 12:35:18 -07:00
Eric Fischer
ebeb45bf1f
Merge "Import translations. DO NOT MERGE"
2012-06-13 12:32:56 -07:00
Eric Fischer
82134f7693
Merge "Import translations. DO NOT MERGE" into jb-dev
2012-06-13 12:32:00 -07:00
Eric Fischer
f545292806
Import translations. DO NOT MERGE
...
Change-Id: Icdda9465030438dbc0d54cca09555544257b1f62
2012-06-13 12:15:29 -07:00
Eric Fischer
1d4062c746
Import translations. DO NOT MERGE
...
Change-Id: Ic1cf133bf3f6b25be1bc748595024f973c0f0deb
2012-06-13 12:05:16 -07:00
Irfan Sheriff
b31a6d7824
Merge "Improve wps pincode input"
2012-06-13 12:00:35 -07:00
Adam Powell
70e11e50ee
MediaRouter dialog
...
Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton.
Still TODO:
* Switch audio icon based on source; speaker/bt/user
* Rig up volume slider
* Rig up item icons
* Rig up group button for groupable categories
* Make grouping work
Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
2012-06-13 11:42:10 -07:00
John Reck
a8ae3e94c4
Call WebView.performLongClick instead of performLongClick()
...
Bug: 6656538
Due to the WebView/WebViewClassic refactor we need to call
WebView.performLongClick instead of performLongClick directly
to allow subclasses to override performLongClick
Change-Id: I9b580217fbafc82d03e63eabfdda9f5bad98db0f
2012-06-13 10:58:34 -07:00
Chris Craik
14584f1b6d
am 06d6204a: am d772c487: Merge "Fix attachFunctor path to ignore delay" into jb-dev
...
* commit '06d6204a2ea7dd263b718018dbb81a88b9a516d5':
Fix attachFunctor path to ignore delay
2012-06-13 10:49:02 -07:00
Chris Craik
06d6204a2e
am d772c487: Merge "Fix attachFunctor path to ignore delay" into jb-dev
...
* commit 'd772c4878e2207795e92b26a462fd02bca7e3c2e':
Fix attachFunctor path to ignore delay
2012-06-13 10:43:19 -07:00
Chris Craik
d772c4878e
Merge "Fix attachFunctor path to ignore delay" into jb-dev
2012-06-13 10:34:59 -07:00
Daniel Sandler
916ad91c38
Remove line3 in big notification unless there's text to show.
...
If you have no subText or summaryText in a big template, but
you *do* have a number, the overflow bar (below the big text
or inbox or whatever) would have shown; now it does not.
Bug: 6657006
Change-Id: Ib2af2712da3a98227bd8d697560893adbdc427e9
2012-06-13 12:17:07 -04:00
Daniel Sandler
eb859df3f9
am e63d952a: am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
...
* commit 'e63d952a9294c1257598edc13b3457b7a0d81e63':
"Two actions ought to be enough for anybody."
2012-06-13 07:14:31 -07:00
Daniel Sandler
e63d952a92
am 7d2e8960: Merge ""Two actions ought to be enough for anybody."" into jb-dev
...
* commit '7d2e8960d0fcebf924c60dbd0f6934368ceb80e3':
"Two actions ought to be enough for anybody."
2012-06-13 07:10:03 -07:00
Daniel Sandler
7d2e8960d0
Merge ""Two actions ought to be enough for anybody."" into jb-dev
2012-06-13 07:07:02 -07:00
Jim Miller
505bfd0c3d
am 84f13daf: am cbf026fc: Fix 6641800: Remove unnecessary padding below status view
...
* commit '84f13dafa9a837087e515f791aeef7cd5c216046':
Fix 6641800: Remove unnecessary padding below status view
2012-06-12 20:24:07 -07:00
Jim Miller
84f13dafa9
am cbf026fc: Fix 6641800: Remove unnecessary padding below status view
...
* commit 'cbf026fc1f595c4e13d411bc61d5008eaf7b460c':
Fix 6641800: Remove unnecessary padding below status view
2012-06-12 20:20:06 -07:00
Jim Miller
cbf026fc1f
Fix 6641800: Remove unnecessary padding below status view
...
This fixes a bug on a 600dp device where the owner info text
was clipped.
Change-Id: I5293b6c1f508307dc55b23d6e2f219e9fa735693
2012-06-12 19:56:34 -07:00
Jim Miller
79cb9b52e8
am 5f190731: am 955a0169: Fix 6613962: Update keyguard to use new GlowPadView UX design.
...
* commit '5f1907316e0085073a314dcfa41bfb35a7f31f9f':
Fix 6613962: Update keyguard to use new GlowPadView UX design.
2012-06-12 19:47:37 -07:00