30434 Commits

Author SHA1 Message Date
Jeff Sharkey
154be52ae7 Merge "Offer parsed TCP interface statistics." 2013-02-07 00:38:21 +00:00
Jeff Sharkey
4b17a1321d Offer parsed TCP interface statistics.
Also switch to newer iface_stat_fmt numbers, which are measured at
XT level instead of dev.

Bug: 7903145, 6569689
Change-Id: Ibeb742966b8c89916ea31a49388a5dbe25a5f67f
2013-02-06 16:23:12 -08:00
Mathias Agopian
ed77dce854 Merge "rework SystemSensorManager.java" 2013-02-06 23:32:42 +00:00
Dake Gu
d3a72135c8 am bfb64e85: am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and others
* commit 'bfb64e85e608889f18f4273b0f07a3d91d4082bd':
  SimulatdDpad: fix NPE for event without device
2013-02-06 15:11:29 -08:00
Adam Powell
2d9c0cac8b am 044a4c3e: am 351f7817: am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '044a4c3e4a42aae4faac8b92ea05f122cdf45f7c':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 15:11:24 -08:00
Dake Gu
bfb64e85e6 am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android (Google) Code Review (1) and Dake Gu (1)
* commit '96111ddff7af61ce37fa8d9020d8e1eeba9095e8':
  SimulatdDpad: fix NPE for event without device
2013-02-06 15:01:17 -08:00
Adam Powell
351f7817e5 am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '21af9a08465c4927aab9db30efdfcf5ee8f52410':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 14:58:41 -08:00
Dake Gu
96111ddff7 Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev 2013-02-06 22:57:26 +00:00
Adam Powell
21af9a0846 Merge "avoid multiple-"0" to exceed the length of upper bound" 2013-02-06 22:11:19 +00:00
Svetoslav
ab080da60f Merge "Set accessibility cursor in non-text views with content description." 2013-02-06 20:12:03 +00:00
Svetoslav
bcc46a0d03 Set accessibility cursor in non-text views with content description.
We support text traversal at a granularity over non-next views with
content description, hence we should support setting the cursor position
in such views.

bug:8134469

Change-Id: I4dba225b0ade795b7a20c201fb906ae7146c065d
2013-02-06 11:58:03 -08:00
Derek Sollenberger
23e500d168 Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" 2013-02-06 12:57:38 +00:00
Dianne Hackborn
0984780bc7 Merge "App ops: add op for writing settings." 2013-02-06 01:34:40 +00:00
Dianne Hackborn
961321fe4e App ops: add op for writing settings.
Also fix a build.

And fix a bug that I think was introduced in the multi-user work
that removed the permission check for writing to settings...!

Change-Id: I5945682faa789ffc78fd3546c0df7d03693f106d
2013-02-05 17:22:41 -08:00
Mathias Agopian
33c239f748 Merge "allow the framework to access a Sensor's handle" 2013-02-06 01:14:22 +00:00
Adam Powell
1fb69f0f35 am 0714e37c: am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse
# Via Android Git Automerger (3) and Adam Powell (1)
* commit '0714e37cb7acafbc93f2fac40dbb200cd2a96514':
  Fix re-enabled state of up after action view collapse
2013-02-05 16:57:53 -08:00
Adam Powell
0714e37cb7 am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse
# Via Android Git Automerger (2) and Adam Powell (1)
* commit 'a7e028a976c3f3692fa3c72f0ae11c01354e4c9a':
  Fix re-enabled state of up after action view collapse
2013-02-05 16:54:45 -08:00
Adam Powell
a7e028a976 am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell (1) and Android Git Automerger (1)
* commit 'cef582ab0346afdaff9190565d432a9468ecdd7d':
  Fix re-enabled state of up after action view collapse
2013-02-05 16:53:04 -08:00
Adam Powell
07cf971e58 Fix re-enabled state of up after action view collapse
A certain call ordering to the action bar could cause the record of
the pre-action view expanded home button enabled state to be
incorrect. Store this in all cases, not just when the action view is
initially expanded. (Except for when we actually disable it for the
expanded view.)

If an action view is already expanded when we get a call to change the
enabled state of the home/up button, don't modify the state of the up
container or other accessibility info, but record the new state if
requested.

Bug 8142097

Change-Id: I070c151aa9f2046d2114ee541d964bf68c6f0def
2013-02-05 16:24:25 -08:00
Svetoslav
92826459d1 Fix a javaDoc error
Change-Id: Ia23660f102455aefad80cb75a8bbd8fc0d4455c3
2013-02-05 14:57:42 -08:00
Svetoslav
dc3edbb0e5 Merge "Rename a member variable" 2013-02-05 22:32:23 +00:00
Svetoslav
22431a3b6f Rename a member variable
Change-Id: I1f7a3b8119d84a1119637f79fcd3c29f8b79ef27
2013-02-05 14:31:39 -08:00
Craig Mautner
3fed9f185e am e57ed27a: am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Android Git Automerger (2) and others
* commit 'e57ed27a142bdc3b626d10b3806eb24df064e8d3':
  Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:30:08 -08:00
Craig Mautner
e57ed27a14 am 246a283c: am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Android Git Automerger (1) and others
* commit '246a283c007e007181f8892df514dfe04121b7a5':
  Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:26:28 -08:00
Craig Mautner
246a283c00 am fd5a0b36: Merge "Fix unexpected rotation change when re-enabling auto-rotate"
# By Sangkyu Lee
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit 'fd5a0b3681499cbee0d1156b3b6f93fc91320848':
  Fix unexpected rotation change when re-enabling auto-rotate
2013-02-05 14:24:10 -08:00
Svetoslav
eecedffe42 Renaming some APIs
Change-Id: I9e226d39648796f95dd0e86ffecbb3f93544243b
2013-02-05 14:07:15 -08:00
Svetoslav Ganov
c163c606f6 Merge "Handle WebKit selection changes synchronously." 2013-02-05 21:47:22 +00:00
Svetoslav
191bdba819 Merge "Set accessibility cursor position in non-editable views with content description." 2013-02-05 21:45:50 +00:00
Svetoslav
d0c83cccca Set accessibility cursor position in non-editable views with content description.
While an accessibility service can set the cursor position in an editable
text field, it was not possible to set it for non-editable views with
content description. This patch enables that.

bug:8134469

Change-Id: I28b0ef1666b9e3ed5c0642718fbe63d4c9616569
2013-02-05 13:44:25 -08:00
Craig Mautner
fd5a0b3681 Merge "Fix unexpected rotation change when re-enabling auto-rotate" 2013-02-05 21:31:12 +00:00
Dianne Hackborn
f51f61269a App ops: new operations for SMS.
Implementation required a new framework feature
to associate an app op with a broadcast.

Change-Id: I4ff41a52f7ad4ee8fd80cbf7b394f04d6c4315b3
2013-02-05 11:56:12 -08:00
Alon Albert
0a35dd5660 Copy EVENT_COLOR_KEY as String
Change-Id: I84eda41d0b9c091f3d152cc3e899cb40b52ed949
2013-02-05 11:07:56 -08:00
Alon Albert
59b3cfee69 am 2d6ef862: Merge "Add EVENT_COLOR\'s to Event Entity Iterator"
# Via Alon Albert (1) and Android (Google) Code Review (1)
* commit '2d6ef86241e981bff217891e52f2b689dae9a6c1':
  Add EVENT_COLOR's to Event Entity Iterator
2013-02-05 09:35:19 -08:00
Alon Albert
2d6ef86241 Merge "Add EVENT_COLOR's to Event Entity Iterator" 2013-02-05 17:30:50 +00:00
Martin Kosiba
5ee743eef7 Ensure the WebView provider is created onVisibilityChanged.
It is possible for onVisibilityChanged to be called during
WebView construciton.

BUG=7622923

Change-Id: Ie87dae537e1e6dd44d96e9e56982abbc134a31a0
2013-02-05 15:26:39 +00:00
Mathias Agopian
7f84c065fa allow the framework to access a Sensor's handle
this is needed in another CL to fix an issue where
sensors power usage is always reported as 0.

Change-Id: Ie496b98bf4b7e69911bdc99bee14cc924e1d71e8
2013-02-04 19:22:47 -08:00
Svetoslav
ac481d1be4 am 69ced73b: Merge "Updating AccessibilityNodeInfo JavaDoc"
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '69ced73b35277e437c9dbbd9e90bfa06c144062f':
  Updating AccessibilityNodeInfo JavaDoc
2013-02-04 18:22:53 -08:00
Svetoslav
69ced73b35 Merge "Updating AccessibilityNodeInfo JavaDoc" 2013-02-05 02:17:53 +00:00
Svetoslav
901309ce59 Updating AccessibilityNodeInfo JavaDoc
Change-Id: I8f80ed127c73dd4d8bcf9fe81575bb438b3d0f57
2013-02-04 18:16:52 -08:00
Adam Powell
7663f57bc7 am 9c684aab: am 638af2fb: am 6a33c403: am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Android Git Automerger (4) and others
* commit '9c684aab21b095a936e5753fbba378c0a27aa254':
  Fix regression in expanded action view up
2013-02-04 17:22:08 -08:00
Kenny Root
bf30fbe005 am 35e83273: am 3789b2fb: am ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections."
# By Yury Zhauniarovich
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '35e832730c87144b9d8ccb1774ee45ff54d6a3d6':
  Function uri.getAuthority is called twice. Minor doc corrections.
2013-02-04 17:22:02 -08:00
Adam Powell
9c684aab21 am 638af2fb: am 6a33c403: am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '638af2fbb6ecb6ca0e58b06d5b2c6ecabbc7f812':
  Fix regression in expanded action view up
2013-02-04 17:19:43 -08:00
Kenny Root
35e832730c am 3789b2fb: am ace72f6a: Merge "Function uri.getAuthority is called twice. Minor doc corrections."
# By Yury Zhauniarovich
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '3789b2fb823b7632e410c0191ddf77dc1e875196':
  Function uri.getAuthority is called twice. Minor doc corrections.
2013-02-04 17:19:31 -08:00
Mathias Agopian
db772d8134 rework SystemSensorManager.java
- it doesn't need a dedicated thread to pull events out
- events are now sent directly to the proper looper by
  the sensorservice

this simplifies things a lot.

Change-Id: Ifa32fed3eff9007a2ee03aaaa837412cb4c15e52
2013-02-04 17:09:41 -08:00
Adam Powell
638af2fbb6 am 6a33c403: am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '6a33c4031de8f0b323855c6db8d6ee0c812b0f00':
  Fix regression in expanded action view up
2013-02-04 13:54:56 -08:00
Adam Powell
6a33c4031d am 569f138e: am 67389e0a: Merge "Fix regression in expanded action view up" into jb-mr1.1-dev
# Via Adam Powell (1) and others
* commit '569f138ef1a94e6d6cfc0587f06b396a77f00c1c':
  Fix regression in expanded action view up
2013-02-04 13:53:24 -08:00
Alon Albert
971c28b831 Add EVENT_COLOR's to Event Entity Iterator
Bug: 8132457
Change-Id: Id6ace96532aa745c1b36290b525dfdf154fe2134
2013-02-04 13:49:50 -08:00
Adam Powell
62f33030b9 Fix regression in expanded action view up
A bug was introduced when these views were restructured. Make sure that the
Up button for expanded action views functions/focuses correctly.

Bug 8124825

Change-Id: I0a886e62fca21dbb9a173db87642bb79ce9245e7
2013-02-04 12:47:34 -08:00
Daniel Sandler
40e4cadf2f am cd80392f: Merge "Capture semantic Notification.Builder data in extras."
# Via Android (Google) Code Review (1) and Daniel Sandler (1)
* commit 'cd80392fe706e0b419a3e655702006a25d397243':
  Capture semantic Notification.Builder data in extras.
2013-02-04 12:35:09 -08:00
Daniel Sandler
cd80392fe7 Merge "Capture semantic Notification.Builder data in extras." 2013-02-04 20:31:31 +00:00