OSDN Git Service
Daniel Sandler [Thu, 7 Feb 2013 06:06:23 +0000 (22:06 -0800)]
am
fb2b5e04: am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (2) and others
* commit '
fb2b5e04a02669c764e4ebd7a6daf9846d596435':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:06:18 +0000 (22:06 -0800)]
am
2990ed7a: am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (2) and others
* commit '
2990ed7a3bf7314bbd4d98161fbcdcf48098052c':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:03:55 +0000 (22:03 -0800)]
am
1fd77470: am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Android Git Automerger (1) and others
* commit '
1fd774709790b220bb780e95db7275d60a1eae57':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:03:51 +0000 (22:03 -0800)]
am
3c6ee5b5: am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Android Git Automerger (1) and others
* commit '
3c6ee5b509d6360a431290fff4b366848c293899':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 06:01:39 +0000 (22:01 -0800)]
am
1a1e9b31: Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
# By Jorge Ruesga
# Via Gerrit Code Review (1) and Jorge Ruesga (1)
* commit '
1a1e9b317ac2d737ad92a35c4d806f0fda1ede70':
DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock
Jeffrey Brown [Thu, 7 Feb 2013 06:01:34 +0000 (22:01 -0800)]
am
d2bec096: Merge "NullPointerException in SQLiteSession"
# By László Dávid
# Via Gerrit Code Review (1) and László Dávid (1)
* commit '
d2bec0960d04578182905b34795c6895760944dd':
NullPointerException in SQLiteSession
Daniel Sandler [Thu, 7 Feb 2013 05:09:33 +0000 (05:09 +0000)]
Merge "DateView: Use Intent.ACTION_LOCALE_CHANGED to refresh notification bar clock"
Jeffrey Brown [Thu, 7 Feb 2013 04:56:07 +0000 (20:56 -0800)]
am
75701e8f: am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '
75701e8fc92285680637f69e0f004741919ddc10':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:56:03 +0000 (20:56 -0800)]
am
edc93331: am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (2) and others
* commit '
edc933318c9690761866a4da63b551ae09054104':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:55:58 +0000 (20:55 -0800)]
am
3c239d7e: am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (2) and others
* commit '
3c239d7e8d78570b1e17ad968c408506e73a8f3f':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:55:53 +0000 (20:55 -0800)]
am
4e68024c: am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (2) and others
* commit '
4e68024c7e9cf5849bc7c57266b0079113a2562f':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:55:49 +0000 (20:55 -0800)]
am
e646f943: am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (2) and others
* commit '
e646f943fd7c4f9d81a4f2fb4de153a2ad9fd8bc':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:55:45 +0000 (20:55 -0800)]
am
f2873456: am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (2) and others
* commit '
f2873456dd2c7f93b63d4bd6bc0c742dfd153b62':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:55:41 +0000 (20:55 -0800)]
am
3d33806a: am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (2) and others
* commit '
3d33806af0726487badc33d8b5ed6281b3c49bef':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:55:37 +0000 (20:55 -0800)]
am
a3f82b1b: am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (2) and others
* commit '
a3f82b1b2dca74e7f287912cd85069dd74b8bf4d':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:53:25 +0000 (20:53 -0800)]
am
7eb4db35: am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '
7eb4db35935237a6bd029d5bafda97fa5d4d905c':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:53:21 +0000 (20:53 -0800)]
am
a0d547b4: am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Android Git Automerger (1) and others
* commit '
a0d547b43b3508c7253da234f529acf60d00fd13':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:53:17 +0000 (20:53 -0800)]
am
8934c575: am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Android Git Automerger (1) and others
* commit '
8934c57564a864e046c5172ba7d56ab68056ab26':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:53:14 +0000 (20:53 -0800)]
am
1e48b386: am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Android Git Automerger (1) and others
* commit '
1e48b386eac8cb1ca9e6e50d73422661691512dc':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:53:10 +0000 (20:53 -0800)]
am
ca7b1210: am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Android Git Automerger (1) and others
* commit '
ca7b1210292c2fc80fd40f1f4c8662a1faf0b7a5':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:53:06 +0000 (20:53 -0800)]
am
352d84b8: am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Android Git Automerger (1) and others
* commit '
352d84b841e7c81c259f5de576ea127d177b39f8':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:53:03 +0000 (20:53 -0800)]
am
1950d2e6: am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Android Git Automerger (1) and others
* commit '
1950d2e6575e04fc623d1d0bcc32393ce4dfef93':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:52:59 +0000 (20:52 -0800)]
am
e4ce2517: am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '
e4ce25177bdf7720c6b3dd5ea7b48f6b03b06469':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:50:17 +0000 (20:50 -0800)]
am
b9185fd1: Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
# By Ilya Polenov
# Via Gerrit Code Review
* commit '
b9185fd1ffd85239e3ab10ab34cb9d8508970fb4':
Fix PointerCoords Parcel incorrectly storing values as Int32
Jeffrey Brown [Thu, 7 Feb 2013 04:50:13 +0000 (20:50 -0800)]
am
dac4a90d: Merge "fix hover events consume issue"
# By Masanori Ogino
# Via Gerrit Code Review (1) and Masanori Ogino (1)
* commit '
dac4a90d656dca86bd14cd91d685c07d8a6b29a4':
fix hover events consume issue
Jeffrey Brown [Thu, 7 Feb 2013 04:50:09 +0000 (20:50 -0800)]
am
88ba2f48: Merge "Disable usage of WAL in DatabaseHelper"
# By Yevgen Pronenko
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
88ba2f48a2d1193f3877575b2589897a7804aa75':
Disable usage of WAL in DatabaseHelper
Jeffrey Brown [Thu, 7 Feb 2013 04:50:04 +0000 (20:50 -0800)]
am
04ce0d25: Merge "Keep native callbacks when primary SQLiteConnection is recreated"
# By Niklas Brunlid
# Via Gerrit Code Review (1) and Johan Redestig (1)
* commit '
04ce0d253de9ec16f921824409a7b2c13195c19e':
Keep native callbacks when primary SQLiteConnection is recreated
Jeffrey Brown [Thu, 7 Feb 2013 04:50:00 +0000 (20:50 -0800)]
am
ea56499d: Merge "Potential NPE in SQLiteConnection"
# By Sylvain Becuwe
# Via Gerrit Code Review (1) and You Kim (1)
* commit '
ea56499dc36d863f92857ab7f93e5c4436f9654f':
Potential NPE in SQLiteConnection
Jeffrey Brown [Thu, 7 Feb 2013 04:49:54 +0000 (20:49 -0800)]
am
0d47af11: Merge "Clear loaders array after they are destroyed."
# By Roman Mazur
# Via Gerrit Code Review (1) and Roman Mazur (1)
* commit '
0d47af1131c4d4f9f29dad790d919d8599e3a3cc':
Clear loaders array after they are destroyed.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:47 +0000 (20:49 -0800)]
am
af595a0f: Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
# By Jangwon Lee
# Via Gerrit Code Review (1) and git-lg-database.lge.com (1)
* commit '
af595a0f37643f12f32860fdea43fb67b74654b4':
Fix bugs regarding IllegalStateException during moving position in cursorwindow.
Jeffrey Brown [Thu, 7 Feb 2013 04:49:41 +0000 (20:49 -0800)]
am
b314f433: Merge "add reply.writeNoException() for quick response"
# By Sungmin Choi
# Via Gerrit Code Review (1) and Sungmin Choi (1)
* commit '
b314f433905ea2cbc62bd5af658f05261a752e5a':
add reply.writeNoException() for quick response
Jeffrey Brown [Thu, 7 Feb 2013 04:43:00 +0000 (04:43 +0000)]
Merge "NullPointerException in SQLiteSession"
Jeffrey Brown [Thu, 7 Feb 2013 04:42:31 +0000 (04:42 +0000)]
Merge "Fix PointerCoords Parcel incorrectly storing values as Int32"
Jeffrey Brown [Thu, 7 Feb 2013 04:40:30 +0000 (04:40 +0000)]
Merge "fix hover events consume issue"
Jeffrey Brown [Thu, 7 Feb 2013 04:39:35 +0000 (04:39 +0000)]
Merge "Disable usage of WAL in DatabaseHelper"
Jeffrey Brown [Thu, 7 Feb 2013 04:15:31 +0000 (04:15 +0000)]
Merge "Keep native callbacks when primary SQLiteConnection is recreated"
Jeffrey Brown [Thu, 7 Feb 2013 04:04:57 +0000 (04:04 +0000)]
Merge "Potential NPE in SQLiteConnection"
Jeffrey Brown [Thu, 7 Feb 2013 03:59:20 +0000 (03:59 +0000)]
Merge "Clear loaders array after they are destroyed."
Jeffrey Brown [Thu, 7 Feb 2013 03:48:22 +0000 (03:48 +0000)]
Merge "Fix bugs regarding IllegalStateException during moving position in cursorwindow."
Jeffrey Brown [Thu, 7 Feb 2013 03:46:47 +0000 (03:46 +0000)]
Merge "add reply.writeNoException() for quick response"
Stephen Hines [Thu, 7 Feb 2013 03:19:34 +0000 (03:19 +0000)]
Merge "Rename convolve3x3.rs to prevent collisions."
Jason Sams [Thu, 7 Feb 2013 02:17:15 +0000 (02:17 +0000)]
Merge "Implement rs.sendMessage()"
Stephen Hines [Thu, 7 Feb 2013 01:33:18 +0000 (17:33 -0800)]
Rename convolve3x3.rs to prevent collisions.
Change-Id: I9046348959d51fda6142e16f1226fed0c57a6d16
Jeff Sharkey [Thu, 7 Feb 2013 00:37:57 +0000 (00:37 +0000)]
Merge "Offer parsed TCP interface statistics."
Jeff Sharkey [Wed, 6 Feb 2013 05:32:33 +0000 (21:32 -0800)]
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
Chris Craik [Thu, 7 Feb 2013 00:14:05 +0000 (00:14 +0000)]
Merge "Add cap tessellation support"
Maggie Benthall [Thu, 7 Feb 2013 00:04:59 +0000 (00:04 +0000)]
Merge "Fix for SettingsProvider to query for correct user."
Jeff Sharkey [Wed, 6 Feb 2013 23:57:44 +0000 (23:57 +0000)]
Merge "Require that bugreport requesters have DUMP."
Maggie Benthall [Mon, 4 Feb 2013 18:28:19 +0000 (13:28 -0500)]
Fix for SettingsProvider to query for correct user.
insertForUser takes a specified user and attempts to adjust that user's
settings, first looking at their existing settings to determine the difference.
However it was querying the settings for the calling user, rather than for
the user whose settings were being changed.
Also add a test that exercises the fix.
Change-Id: I6ed6fd79154ac1b6e6ab880769ac9081dfff6b80
Chris Craik [Tue, 11 Dec 2012 01:56:27 +0000 (17:56 -0800)]
Add cap tessellation support
bug:
7117155
bug:
8114304
Currently used for lines (with and without AA) and arcs with useCenter=false
Also removes 0.375, 0.375 offset for AA lines
Change-Id: Ic8ace418739344db1e2814edf65253fe7448b0b0
Romain Guy [Wed, 6 Feb 2013 23:34:03 +0000 (23:34 +0000)]
Merge "Fix uninitialized variables in Caches.cpp Bug #
8151401"
Mathias Agopian [Wed, 6 Feb 2013 23:32:12 +0000 (23:32 +0000)]
Merge "rework SystemSensorManager.java"
Romain Guy [Wed, 6 Feb 2013 23:29:46 +0000 (15:29 -0800)]
Fix uninitialized variables in Caches.cpp
Bug #
8151401
Change-Id: I221f93de0f1981974f82a094297836dd3fe418bc
Romain Guy [Wed, 6 Feb 2013 23:29:15 +0000 (23:29 +0000)]
Merge "Fix Snapshot::resetClip to also reset the clip region"
Romain Guy [Wed, 6 Feb 2013 23:28:04 +0000 (15:28 -0800)]
Fix Snapshot::resetClip to also reset the clip region
Change-Id: I979151e73f64ff9d45f8a5232d8700361b09fbc7
Dake Gu [Wed, 6 Feb 2013 23:11:29 +0000 (15:11 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 23:11:24 +0000 (15:11 -0800)]
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
Dake Gu [Wed, 6 Feb 2013 23:01:17 +0000 (15:01 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 23:00:44 +0000 (15:00 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 22:58:41 +0000 (14:58 -0800)]
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
Dake Gu [Wed, 6 Feb 2013 22:56:58 +0000 (22:56 +0000)]
Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev
Adam Powell [Wed, 6 Feb 2013 22:11:19 +0000 (22:11 +0000)]
Merge "avoid multiple-"0" to exceed the length of upper bound"
Scott Main [Wed, 6 Feb 2013 20:31:26 +0000 (12:31 -0800)]
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
Scott Main [Wed, 6 Feb 2013 20:26:46 +0000 (12:26 -0800)]
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
Scott Main [Wed, 6 Feb 2013 20:23:36 +0000 (12:23 -0800)]
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
Scott Main [Wed, 6 Feb 2013 20:20:59 +0000 (12:20 -0800)]
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
Scott Main [Wed, 6 Feb 2013 20:19:30 +0000 (12:19 -0800)]
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
Scott Main [Wed, 6 Feb 2013 20:14:48 +0000 (20:14 +0000)]
Merge "docs: fix renderscript links that currently require redirect" into jb-mr1-dev
Svetoslav [Wed, 6 Feb 2013 20:11:30 +0000 (20:11 +0000)]
Merge "Set accessibility cursor in non-text views with content description."
Svetoslav [Wed, 6 Feb 2013 19:56:00 +0000 (11:56 -0800)]
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
Victoria Lease [Wed, 6 Feb 2013 17:50:49 +0000 (17:50 +0000)]
Merge "refactor isAllowedBySettingsLocked()"
The Android Open Source Project [Wed, 6 Feb 2013 17:13:58 +0000 (09:13 -0800)]
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
The Android Open Source Project [Wed, 6 Feb 2013 17:11:21 +0000 (09:11 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3455d526f17f7dc7a6e00f9ea1e2612a5c541668
Victoria Lease [Wed, 6 Feb 2013 17:01:23 +0000 (17:01 +0000)]
Merge "Fix addGpsStatusListener"
Derek Sollenberger [Wed, 6 Feb 2013 12:57:37 +0000 (12:57 +0000)]
Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"
Jason Sams [Wed, 6 Feb 2013 03:20:18 +0000 (19:20 -0800)]
Implement rs.sendMessage()
Change-Id: Ib4f4bb7bb4f697d0b5405ad55721394ed2456c65
Dianne Hackborn [Wed, 6 Feb 2013 01:34:40 +0000 (01:34 +0000)]
Merge "App ops: add op for writing settings."
Dianne Hackborn [Wed, 6 Feb 2013 01:22:41 +0000 (17:22 -0800)]
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
Mathias Agopian [Wed, 6 Feb 2013 01:13:53 +0000 (01:13 +0000)]
Merge "allow the framework to access a Sensor's handle"
Adam Powell [Wed, 6 Feb 2013 00:57:53 +0000 (16:57 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 00:54:45 +0000 (16:54 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 00:13:57 +0000 (16:13 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 00:53:04 +0000 (16:53 -0800)]
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
Adam Powell [Wed, 6 Feb 2013 00:51:01 +0000 (16:51 -0800)]
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
Jason Sams [Wed, 6 Feb 2013 00:32:21 +0000 (00:32 +0000)]
Merge "Log non-fatal RS errors."
Adam Powell [Wed, 6 Feb 2013 00:13:57 +0000 (16:13 -0800)]
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
Victoria Lease [Wed, 6 Feb 2013 00:07:32 +0000 (16:07 -0800)]
Fix addGpsStatusListener
.detrevni saw tset ()sseccAnoitacoLkcehc eht smees tI
Bug:
8131283
Change-Id: I91ded29338c93aa7ab35d849fc5338b3f6d6590b
Irfan Sheriff [Tue, 5 Feb 2013 23:42:48 +0000 (23:42 +0000)]
Merge "Allow null serverAddress"
Irfan Sheriff [Tue, 5 Feb 2013 23:36:21 +0000 (15:36 -0800)]
Allow null serverAddress
Bug:
7993077
Change-Id: Id54d517c330b73ce5799c9dc9bc00226a9e71e14
Robert Ly [Tue, 5 Feb 2013 23:29:18 +0000 (15:29 -0800)]
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
Robert Ly [Tue, 5 Feb 2013 23:26:29 +0000 (15:26 -0800)]
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
Robert Ly [Tue, 5 Feb 2013 23:24:30 +0000 (15:24 -0800)]
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
Robert Ly [Tue, 5 Feb 2013 23:22:52 +0000 (15:22 -0800)]
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
Robert Ly [Tue, 5 Feb 2013 23:19:45 +0000 (15:19 -0800)]
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
Robert Ly [Tue, 5 Feb 2013 23:17:01 +0000 (23:17 +0000)]
Merge "docs: update auth doc to mention multiple scopes bug
7644251" into jb-mr1-dev
Jason Sams [Tue, 5 Feb 2013 23:05:39 +0000 (15:05 -0800)]
Log non-fatal RS errors.
Change-Id: I3e58b89453af8955ba9df825ec143e793890f44a
Romain Guy [Tue, 5 Feb 2013 23:02:44 +0000 (23:02 +0000)]
Merge "Add support for non-antialiased text"
Svetoslav [Tue, 5 Feb 2013 22:57:42 +0000 (14:57 -0800)]
Fix a javaDoc error
Change-Id: Ia23660f102455aefad80cb75a8bbd8fc0d4455c3
Romain Guy [Tue, 5 Feb 2013 22:38:40 +0000 (14:38 -0800)]
Add support for non-antialiased text
Change-Id: I17c073955ab94abc9b409e5fcfbc675faa07c5ba
Svetoslav [Tue, 5 Feb 2013 22:34:36 +0000 (22:34 +0000)]
Merge "Ensure touch explorer and magnifier get a well-formed event stream."