99727 Commits

Author SHA1 Message Date
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
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
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
f21f175369 Merge "refactor isAllowedBySettingsLocked()" 2013-02-06 17:51:09 +00: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
91641ec553 Merge "Fix addGpsStatusListener" 2013-02-06 17:01:56 +00: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
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
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
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
b59967b655 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 (4) and others
* commit 'c92199be8416493739e3fc02666227092a6077a8':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:29:18 -08:00
Robert Ly
c92199be84 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 (3) and others
* commit '33fb8f6309c553c809717694a84fe6564b19604f':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:26:29 -08:00
Robert Ly
33fb8f6309 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 (2) and others
* commit 'dfa8d02861ac2afb7addcb884b58dd009e2f212e':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:24:30 -08:00
Robert Ly
dfa8d02861 am 5e9be5bc: am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit '5e9be5bcf2d423e516d3c061fffc989ffa444212':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:22:52 -08:00
Robert Ly
5e9be5bcf2 am d6e0c147: Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'd6e0c147175708bcc02813fc0f4008179e95b9e7':
  docs: update auth doc to mention multiple scopes bug 7644251
2013-02-05 15:19:45 -08:00
Robert Ly
d6e0c14717 Merge "docs: update auth doc to mention multiple scopes bug 7644251" into jb-mr1-dev 2013-02-05 23:17:36 +00:00
Jason Sams
a4b7bc9786 Log non-fatal RS errors.
Change-Id: I3e58b89453af8955ba9df825ec143e793890f44a
2013-02-05 15:05:39 -08:00
Romain Guy
484f3bdcd6 Merge "Add support for non-antialiased text" 2013-02-05 23:02:44 +00:00
Svetoslav
92826459d1 Fix a javaDoc error
Change-Id: Ia23660f102455aefad80cb75a8bbd8fc0d4455c3
2013-02-05 14:57:42 -08:00
Romain Guy
b969a0de65 Add support for non-antialiased text
Change-Id: I17c073955ab94abc9b409e5fcfbc675faa07c5ba
2013-02-05 14:44:43 -08:00
Svetoslav
506f65c304 Merge "Ensure touch explorer and magnifier get a well-formed event stream." 2013-02-05 22:35:02 +00: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
Scott Main
b47fa1699a docs: fix renderscript links that currently require redirect
Change-Id: Ie12ff2c4be5ca22ac43dfe3a16868c7bef8e4ae8
2013-02-05 14:23:13 -08:00