94940 Commits

Author SHA1 Message Date
Jeffrey Brown
d2bec0960d Merge "NullPointerException in SQLiteSession" 2013-02-07 04:43:00 +00:00
Jeffrey Brown
b9185fd1ff Merge "Fix PointerCoords Parcel incorrectly storing values as Int32" 2013-02-07 04:42:31 +00:00
Jeffrey Brown
dac4a90d65 Merge "fix hover events consume issue" 2013-02-07 04:40:30 +00:00
Jeffrey Brown
88ba2f48a2 Merge "Disable usage of WAL in DatabaseHelper" 2013-02-07 04:39:35 +00:00
Ki-Hwan Lee
4ef158baa3 Fix ViewRootImpl to find missing focus using D-pad.
By using D-pad, no-focus in non touch mode is rare but legal in a case like below.

1. The first request to get focus for a new activity is handled in the first
   performTraversals() call when activity is not ready for a complete view hierarchy.
   So there might be no focusable yet.
2. If the activity has some menus, ActionMenuView can be attached to the view hierarchy
   in the PhoneWindow.preparePanel() soon.
   So there can be focusables but still not focused.

Fixed ViewRootImpl.deliverKeyEventPostIme() to handle this case to resurrect a focus
if there are focusables.

How to reproduce:
(1) Open "API Demos" application -> Views -> Search View
(2) Select "Action Bar" item using the D-pad
(3) Try to focus the Search View, using the D-pad.

Change-Id: Ic379774f0307f168f0ed775d0f6a9078ac5c9713
2013-02-07 13:26:14 +09:00
Jeffrey Brown
04ce0d253d Merge "Keep native callbacks when primary SQLiteConnection is recreated" 2013-02-07 04:15:32 +00:00
Jeffrey Brown
ea56499dc3 Merge "Potential NPE in SQLiteConnection" 2013-02-07 04:04:58 +00:00
Jeffrey Brown
0d47af1131 Merge "Clear loaders array after they are destroyed." 2013-02-07 03:59:20 +00:00
Jeffrey Brown
af595a0f37 Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow." 2013-02-07 03:48:23 +00:00
Jeffrey Brown
b314f43390 Merge "add reply.writeNoException() for quick response" 2013-02-07 03:46:48 +00: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
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
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
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
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
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
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
The Android Open Source Project
aee2de934d Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7375c870961b812350a960b43344619cdd9ed8ea
2013-02-05 13:50:17 -08:00
Craig Mautner
fd5a0b3681 Merge "Fix unexpected rotation change when re-enabling auto-rotate" 2013-02-05 21:31:12 +00:00
quddusc
a8ce402078 am 77c6f8ee: am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
# Via Android Git Automerger (3) and quddusc (1)
* commit '77c6f8ee22c66c829ea91740d178ff3323e1cb67':
  docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:36:11 -08:00
quddusc
77c6f8ee22 am a6a320ab: am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
# Via Android Git Automerger (2) and quddusc (1)
* commit 'a6a320ab6699e17d22aea8fa21345e86cae0349c':
  docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:33:52 -08:00
quddusc
a6a320ab66 am 640d570d: am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
# Via Android Git Automerger (1) and quddusc (1)
* commit '640d570d255988ed9942cda6df5f162328668437':
  docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:31:45 -08:00
quddusc
640d570d25 am 1247fbd4: docs: Removed the -e runner subcommand option. Bug: 7562330
# Via quddusc
* commit '1247fbd43fc9d5492cb97d6313e851a6518ab4b8':
  docs: Removed the -e runner subcommand option. Bug: 7562330
2013-02-05 12:29:08 -08:00
The Android Automerger
afd51f18e5 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2013-02-05 12:24:23 -08:00
quddusc
1247fbd43f docs: Removed the -e runner subcommand option.
Bug: 7562330

Change-Id: I5fb7ee00583a8c25745796721ded8f6cba6f09ca
2013-02-05 11:37:46 -08:00
Robert Ly
9fcde2e746 am cb815699: am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android Git Automerger (3) and others
* commit 'cb8156996a3bf5f75ea3dd7c289970bae32079ce':
  docs: update javadocs for gms and gcm
2013-02-05 10:23:04 -08:00
Robert Ly
cb8156996a am 00e9db5d: am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android Git Automerger (2) and others
* commit '00e9db5d927e1c725665159f6b5c15e0c33a4c1b':
  docs: update javadocs for gms and gcm
2013-02-05 10:21:41 -08:00
Robert Ly
00e9db5d92 am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android (Google) Code Review (1) and others
* commit 'b23a35a3b9f44f3f673e9cacc3684d034414df27':
  docs: update javadocs for gms and gcm
2013-02-05 10:20:42 -08:00
Robert Ly
b23a35a3b9 am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit 'ba84a04a2f98683f08cc7c73ec60341dc77d1eb9':
  docs: update javadocs for gms and gcm
2013-02-05 10:15:57 -08:00
Robert Ly
ba84a04a2f Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 2013-02-05 18:12:56 +00:00
Robert Ly
f6f5cf484c docs: update javadocs for gms and gcm
Change-Id: If5c80d3fac68a6351b652a19c199de1107ebd593
2013-02-05 09:26:35 -08:00
Kenny Root
2697f08201 am 887c5236: am 74637db2: Merge "AndroidKeyStore: return error code on error"
# Via Android Git Automerger (1) and others
* commit '887c523646012f4f0b63f5ffd0a1e9ebc3c2bdf1':
  AndroidKeyStore: return error code on error
2013-02-04 17:37:34 -08:00
Kenny Root
887c523646 am 74637db2: Merge "AndroidKeyStore: return error code on error"
# Via Gerrit Code Review (1) and Kenny Root (1)
* commit '74637db21eb0b3c0167378e2b5c866fdc02e51f2':
  AndroidKeyStore: return error code on error
2013-02-04 17:35:35 -08:00