Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,405 Commits 3 Branches 0 Tags
b25f48f2be76a99088426ca068dd80fbf3e6dc5f
Commit Graph

23911 Commits

Author SHA1 Message Date
Jason Simmons
b25f48f2be am 1d28fef9: Stop any running DHCP client before bringup up an Ethernet interface 
* commit '1d28fef92e516b0144d7844413194ba9e953b317':
  Stop any running DHCP client before bringup up an Ethernet interface
 2012-06-14 11:54:43 -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
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
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
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
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
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
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
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
Jeff Sharkey
554259fe02 am 9eabf916: am f6f7f1d2: Low disk space string change, surface state. 
* commit '9eabf916dc5d53bc6c765d39cca0847993e73dcf':
  Low disk space string change, surface state.
 2012-06-12 18:40:24 -07:00
Jeff Sharkey
9eabf916dc am f6f7f1d2: Low disk space string change, surface state. 
* commit 'f6f7f1d2dc6e8fad5d6ff9a56af9929488873b4f':
  Low disk space string change, surface state.
 2012-06-12 18:36:07 -07:00
Amith Yamasani
b8151ecd6e Add an icon to the user information. 
Store the icon in the user folder under /data/system,
similar to how the wallpaper is stored.

Change-Id: Id8ccb55b9e2ba7b4c557505a7f69f04eca1518cf
 2012-06-12 18:18:29 -07:00
Chris Craik
cb82b942c8 Fix attachFunctor path to ignore delay 
Don't defer functor invocation when calling attach functor directly.

bug:6653638

Change-Id: Ifffc027df16612f380f39b82b7d0a4411d53b4ea
 2012-06-12 17:55:18 -07:00
Jeff Sharkey
f6f7f1d2dc Low disk space string change, surface state. 
Surface current low disk state through IPackageManager for use in
Settings app.

Bug: 6576409
Change-Id: I9ae9ce99a2faa3015a237036c03567d1ae11628f
 2012-06-12 17:12:08 -07:00
George Mount
9b6eb6939e Hide handles when clipped by layer or edit region. 
Bug 6590742
 Separated base and extent handle alpha so that they can
 be hidden individually. Added visiblity check and animations
 to show and hide the handles.

Change-Id: I08ce7f870bbb8e059550797afa18c2db39394caf
 2012-06-12 16:08:20 -07:00
Romain Guy
95fc7a246f Merge "Remove ViewTreeObserver allocations" 2012-06-12 15:27:06 -07:00
Romain Guy
c39ed4a6e5 Remove ViewTreeObserver allocations 
A couple of allocations remain to handle possibly recursive listeners.

Change-Id: I72fd271c2fc4f4ad427a27e0665f780cae117aea
 2012-06-12 15:23:52 -07:00
Daniel Sandler
602ad1c978 "Two actions ought to be enough for anybody." 
Bug: 6650170
Change-Id: I5ee6990a8e556f9ee1fbfb0989db33f75b07f4ea
 2012-06-12 16:06:27 -04:00
Adam Powell
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev 
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
 2012-06-12 13:01:30 -07:00
Gilles Debunne
30103f6698 am 735b9598: am a447eaca: Merge "Prevent a crash when maxLines is set to 0" into jb-dev 
* commit '735b9598a2c7824befbdfc55ef4991ca01550d84':
  Prevent a crash when maxLines is set to 0
 2012-06-12 13:01:15 -07:00
Dianne Hackborn
5ef59976b1 am f59467b3: am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev 
* commit 'f59467b3d6c5df8bf90de799e212275e5c26de86':
  Fix issue #6634325: View.setKeepScreenOn and...
 2012-06-12 13:01:12 -07:00
Jeff Brown
d3f97dc0fb am 14afbba6: am ea6b8188: Merge "Improve ANR diagnostics." into jb-dev 
* commit '14afbba66355fab168bed25c9bab33058372584a':
  Improve ANR diagnostics.
 2012-06-12 13:01:06 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev 
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
 2012-06-12 13:00:47 -07:00
Jeff Brown
2dc7232140 am 62007aba: am 519e91ef: Merge "Detect bad behavior earlier in Choreographer." into jb-dev 
* commit '62007aba1998055cf6ab3e610ed97dbe06341056':
  Detect bad behavior earlier in Choreographer.
 2012-06-12 13:00:40 -07:00
Victoria Lease
49ccb116e9 am 1b15102f: am 72b8fc7e: Merge "Revert "Fix fake bold for fallback fonts in frameworks."" into jb-dev 
* commit '1b15102fc040f59c72c6453dee15b791f54c9f06':
  Revert "Fix fake bold for fallback fonts in frameworks."
 2012-06-12 13:00:37 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev 
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
 2012-06-12 13:00:33 -07:00
Romain Guy
bc62684f02 am 265888fe: am 6b5caee4: Merge "Prevent crash in WebView when disabling the hw renderer Bug #6596807" into jb-dev 
* commit '265888fe6a57d5b77279c97b68cfa25865267e6b':
  Prevent crash in WebView when disabling the hw renderer Bug #6596807
 2012-06-12 13:00:28 -07:00
Svetoslav Ganov
23ef5fcff4 am 5d15f40a: am f372e331: Merge "NPE when iterating by character and word in Launcher widgets." into jb-dev 
* commit '5d15f40a19be01fa9c5a9674b31b6b18774cbeac':
  NPE when iterating by character and word in Launcher widgets.
 2012-06-12 13:00:25 -07:00
Dianne Hackborn
b1add0b8f2 am 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-dev 
* commit '6892f1ec9670432f1cab71813592077bea991a8b':
  Fix issue #6641368: can't launch gallery
 2012-06-12 13:00:15 -07:00