99760 Commits

Author SHA1 Message Date
Romain Guy
3f910dddae am 83315e0c: Merge "Fix Snapshot::resetClip to also reset the clip region"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '83315e0cb425db5dde514c90df56a7188c7983d5':
  Fix Snapshot::resetClip to also reset the clip region
2013-02-06 15:35:22 -08:00
Romain Guy
83315e0cb4 Merge "Fix Snapshot::resetClip to also reset the clip region" 2013-02-06 23:29:15 +00:00
Romain Guy
3c099c42fd Fix Snapshot::resetClip to also reset the clip region
Change-Id: I979151e73f64ff9d45f8a5232d8700361b09fbc7
2013-02-06 15:28:04 -08:00
Dake Gu
88e9e0f6ea am d3a72135: am bfb64e85: am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
# Via Android Git Automerger (2) and others
* commit 'd3a72135c82ae221881853912a6866467e86d9f2':
  SimulatdDpad: fix NPE for event without device
2013-02-06 15:14:03 -08:00
Adam Powell
da7e4584c0 am 2d9c0cac: am 044a4c3e: am 351f7817: am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (3) and others
* commit '2d9c0cac8be1f4d8bafd57f61de9b59cd4dd55ea':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 15:14:00 -08: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
044a4c3e4a am 351f7817: am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '351f7817e555f52571e72751bb452a715495f010':
  avoid multiple-"0" to exceed the length of upper bound
2013-02-06 15:00:44 -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
Scott Main
dbab0ce61a am e68c1ce1: am 11f1c5b8: am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'e68c1ce1d41ac43b0d59015f3556ca20bf7e4548':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:38:10 -08:00
Scott Main
e68c1ce1d4 am 11f1c5b8: am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (4) and others
* commit '11f1c5b89a98cb6794f2b1f158b8c22e38af975f':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:31:26 -08:00
Scott Main
11f1c5b89a am b3a57191: am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'b3a57191e62e0c394ba4a3448770853a1fb7ac3b':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:26:46 -08:00
Scott Main
b3a57191e6 am 0a00de11: am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '0a00de118eedf9d050404f944bd563c27b86763e':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:23:36 -08:00
Scott Main
0a00de118e am 805d2e2d: am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '805d2e2d98fa8749d6ae38650c77c79611174944':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:20:59 -08:00
Scott Main
805d2e2d98 am 00f49084: Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit '00f490844d89b146e5490204a5a483834950c489':
  docs: fix renderscript links that currently require redirect
2013-02-06 12:19:30 -08:00
Svetoslav
226d80236f am ab080da6: Merge "Set accessibility cursor in non-text views with content description."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit 'ab080da60f344e9138b656335010c6da27be4888':
  Set accessibility cursor in non-text views with content description.
2013-02-06 12:15:18 -08:00
Scott Main
00f490844d Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev 2013-02-06 20:14:49 +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
Victoria Lease
bdaa6274e6 am f21f1753: Merge "refactor isAllowedBySettingsLocked()"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit 'f21f175369783d9a77f1e580b42ef9b3e918c2af':
  refactor isAllowedBySettingsLocked()
2013-02-06 09:53:52 -08:00
Victoria Lease
f21f175369 Merge "refactor isAllowedBySettingsLocked()" 2013-02-06 17:51:09 +00:00
The Android Open Source Project
81364f12fc am 150edcaf: (-s ours) am 90976c84: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# By Adam Powell
# Via Android Git Automerger (1) and others
* commit '150edcaf8b7eeeba8a4753eb0f6b9855ad1e1eb1':
  Fix re-enabled state of up after action view collapse
2013-02-06 09:16:46 -08:00
The Android Open Source Project
150edcaf8b am 90976c84: (-s ours) Reconcile with jb-mr1.1-release - do not merge
# By Adam Powell
# Via The Android Automerger (1) and The Android Open Source Project (1)
* commit '90976c8493ab9439eb8ddaad30aaa0d171467f43':
  Fix re-enabled state of up after action view collapse
2013-02-06 09:13:58 -08:00
The Android Open Source Project
90976c8493 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668
2013-02-06 09:11:21 -08:00
Victoria Lease
a976eb7ad4 am 91641ec5: Merge "Fix addGpsStatusListener"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '91641ec5538aa3b9872f24c43f811bffbcd12368':
  Fix addGpsStatusListener
2013-02-06 09:05:32 -08:00
Victoria Lease
91641ec553 Merge "Fix addGpsStatusListener" 2013-02-06 17:01:56 +00:00
Derek Sollenberger
4da1b71356 am 23e500d1: Merge "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'"
# Via Android (Google) Code Review (1) and Derek Sollenberger (1)
* commit '23e500d168e8d649305445f6c1d2b49d8d2c00fd':
2013-02-06 05:04:44 -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
f317770c57 am 0984780b: Merge "App ops: add op for writing settings."
# Via Android (Google) Code Review (1) and Dianne Hackborn (1)
* commit '0984780bc7aed76018b9f88c0d9c3ce300bde39a':
  App ops: add op for writing settings.
2013-02-05 17:39:10 -08: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
cb2d0844ae am 33c239f7: Merge "allow the framework to access a Sensor\'s handle"
# Via Android (Google) Code Review (1) and Mathias Agopian (1)
* commit '33c239f74816449979456e8535b8e058057373d7':
  allow the framework to access a Sensor's handle
2013-02-05 17:17:36 -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
a5a4259623 am 1fb69f0f: am 0714e37c: am a7e028a9: am cef582ab: am 07cf971e: Fix re-enabled state of up after action view collapse
# Via Android Git Automerger (4) and Adam Powell (1)
* commit '1fb69f0f354cf6743e1f30b55e9ca2f9252cf99e':
  Fix re-enabled state of up after action view collapse
2013-02-05 17:00:37 -08: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
bd0fd29f83 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:53:26 -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
cef582ab03 am 07cf971e: Fix re-enabled state of up after action view collapse
# Via Adam Powell
* commit '07cf971e58aecab76f2b5b575cfe62120005c6e4':
  Fix re-enabled state of up after action view collapse
2013-02-05 16:51:01 -08:00
Jason Sams
59f5ca4c71 am 7c96e3f9: Merge "Log non-fatal RS errors."
# Via Android (Google) Code Review (1) and Jason Sams (1)
* commit '7c96e3f979197c3f89a9e92be99d9a0898c253fb':
  Log non-fatal RS errors.
2013-02-05 16:37:51 -08:00
Jason Sams
7c96e3f979 Merge "Log non-fatal RS errors." 2013-02-06 00:32:36 +00: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
Victoria Lease
3d5173deea Fix addGpsStatusListener
.detrevni saw tset ()sseccAnoitacoLkcehc eht smees tI

Bug: 8131283
Change-Id: I91ded29338c93aa7ab35d849fc5338b3f6d6590b
2013-02-05 16:09:41 -08:00
Irfan Sheriff
040e8754fe am 4f53f2b5: Merge "Allow null serverAddress"
# Via Android (Google) Code Review (1) and Irfan Sheriff (1)
* commit '4f53f2b5c70893788b500d3c1d9e76573c8f6b62':
  Allow null serverAddress
2013-02-05 15:45:36 -08:00
Irfan Sheriff
4f53f2b5c7 Merge "Allow null serverAddress" 2013-02-05 23:42:48 +00:00
Irfan Sheriff
44b31182e1 Allow null serverAddress
Bug: 7993077
Change-Id: Id54d517c330b73ce5799c9dc9bc00226a9e71e14
2013-02-05 15:36:21 -08:00
Robert Ly
ef0e3ed680 am b59967b6: am c92199be: am 33fb8f63: am dfa8d028: am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
# Via Android Git Automerger (5) and others
* commit 'b59967b6556f3ee4071247e22a7f60deb4a2a190':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:30:55 -08:00