Alon Albert
f528e56de0
am 4f895c81: am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev
...
* commit '4f895c8143eef5e6bdc1f3a74c74b09bc1437a14':
Skip operations for users who are not running
2012-09-24 09:58:12 -07:00
Alon Albert
d5aa6bd073
am d1631f76: am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev
...
* commit 'd1631f76b8e4797957cb85f4a8ce9926dd2c163b':
Add columns to CalendarContract
2012-09-24 09:54:16 -07:00
Alon Albert
fcf0061ebf
Merge "Skip operations for users who are not running" into jb-mr1-dev
2012-09-24 09:53:33 -07:00
Alon Albert
0ff6537568
Merge "Add columns to CalendarContract" into jb-mr1-dev
2012-09-24 09:46:59 -07:00
Jim Miller
fa3b11643b
am fc74a44f: am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev
...
* commit 'fc74a44f3e2df846fb009fe326809ed76537265b':
Better handling of multiple touch events in GlowPadView
2012-09-24 09:39:30 -07:00
Jeff Sharkey
dab41705e0
am 17505666: am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev
...
* commit '175056661d1ec5219a6aec157544e510b9a47203':
Always bind to DefaultContainerService as OWNER.
2012-09-24 09:39:26 -07:00
Fabrice Di Meglio
793d9abb89
am c86c9fc0: am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'c86c9fc092280cb961bf46e87050da9c46836278':
Fix bug #6427629 Clean up layout direction APIs
2012-09-24 09:39:15 -07:00
Fabrice Di Meglio
c60a19e368
am 402bab75: am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '402bab75c360fd038910b3baedff54a1f4762c3d':
Fix bug #6427629 Clean up layout direction APIs
2012-09-24 09:39:07 -07:00
Fabrice Di Meglio
525926078b
am 72d65718: am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '72d657182312c7bac049b3ed94a4658c3935ae28':
Fix bug #6427629 Clean up layout direction APIs
2012-09-24 09:38:51 -07:00
Fabrice Di Meglio
42f11c981c
am c81a319f: am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'c81a319f1a2834590f1b7e5cfed0bbdba49d0838':
Fix bug #6427629 Clean up layout direction APIs
2012-09-24 09:38:43 -07:00
Dianne Hackborn
749bbe97ee
am 55fd212f: am c0e1f268: Merge "Fix issue #7184877 : Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev
...
* commit '55fd212f914a28d0a64202a09f0127fa0a1b4175':
Fix issue #7184877 : Calendar Locksceen Widget crashes and forces phone to reboot
2012-09-24 09:38:36 -07:00
Jeff Sharkey
5c7527ba15
am 8bc3cfa3: am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev
...
* commit '8bc3cfa3674217e967b64340bae6f6003f332e66':
Allow acquiring ContentProviders across users.
2012-09-24 09:38:27 -07:00
Dianne Hackborn
eeb8f97993
am 2552e78a: am b939e352: Merge "Fix issue #7209355 , #7214271." into jb-mr1-dev
...
* commit '2552e78a15d2a88dd0e885ebf9490f8f38d9a393':
Fix issue #7209355 , #7214271 .
2012-09-24 09:38:23 -07:00
Brian Carlstrom
f0c6728ad4
am e3089736: am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
...
* commit 'e308973644d40887a07fe2e31a74c0697b31dedf':
Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
2012-09-24 09:38:16 -07:00
Fabrice Di Meglio
54f49d8fa1
am 443e3f0b: am 57d863c3: Merge "Fix the build" into jb-mr1-dev
...
* commit '443e3f0b7e9025234e02396561b9a9f798c38d60':
Fix the build
2012-09-24 09:38:09 -07:00
Fabrice Di Meglio
63e080904d
am a478de98: am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev
...
* commit 'a478de98a3314df864373f291faa45362dda71bc':
Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
2012-09-24 09:38:05 -07:00
Fabrice Di Meglio
b59cddbaac
am e477ff0c: am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
...
* commit 'e477ff0cde13de7996eb79fa2352cbfa3a3c5b75':
Fix bug #7206086 NumberPicker widget should use locale digits
2012-09-24 09:38:01 -07:00
Eino-Ville Talvala
19a58d2021
am 899d1efa: am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
...
* commit '899d1efa4e83e1e01e885f30450380996bbe69fc':
Unhide and document feature android.hardware.camera.any.
2012-09-24 09:37:54 -07:00
Wu-cheng Li
802fcef997
am 9058a265: am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
...
* commit '9058a26588be24a54b7c6e4cf1ac71fc53901148':
Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
2012-09-24 09:37:46 -07:00
Romain Guy
d2926e4a25
am 454f2be1: am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev
...
* commit '454f2be11f028b49d28154103996a3e71e935272':
Add support for a new developer setting: overdraw debugging
2012-09-24 09:37:34 -07:00
Amith Yamasani
bd565c3ce5
am 56be4dd8: am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev
...
* commit '56be4dd85f09c6f0bfdc1108c513569363013013':
Show lockscreen widgets for the current user.
2012-09-24 09:37:20 -07:00
Eino-Ville Talvala
d2ac940117
am 35f0ee64: am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
...
* commit '35f0ee64899f265eebddf75a31be3b3187529c72':
Add hardware feature android.hardware.camera.any.
2012-09-24 09:37:08 -07:00
Jim Miller
d7aa6110f1
am 99b0d436: am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev
...
* commit '99b0d43645afb2dfd81e1c2ea080de7199fae239':
Remove UID checks from LockPatternUtils
2012-09-24 09:37:04 -07:00
Svetoslav Ganov
412201a944
am 631b6380: am 0a5c5567: Merge "Multi-user support for the accessibility layer." into jb-mr1-dev
...
* commit '631b63804e448d5a29e4089a1ad1804cf0279480':
Multi-user support for the accessibility layer.
2012-09-24 00:52:23 -07:00
Adam Cohen
abe60e41c4
am d6a766ab: am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
...
* commit 'd6a766abaf2abfaf4e8fde9f80ee226d71cf1b09':
Fixing onRestoreInstanceState crash in Launcher
2012-09-24 00:52:13 -07:00
Dianne Hackborn
19a22ced89
am 033e60e8: am c9e94ea6: Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
...
* commit '033e60e87aa5c704caf8d00b30b323dd126c4151':
Fix issue #7213113 : Remove old intent resolver
2012-09-24 00:52:09 -07:00
Adam Cohen
c328f7f8f6
am dce17917: am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev
...
* commit 'dce17917103d25e18063a7d71e592e131f8e0bd3':
Changing public method to @hide, doesn't have to be public
2012-09-24 00:52:02 -07:00
Svetoslav Ganov
dddf962f1c
am a586a3c9: am 38533ea5: Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
...
* commit 'a586a3c9a7d2e317b8b5025faa77f088aed38fd4':
NPE in AcitivtyChooserModel.
2012-09-24 00:51:56 -07:00
Svetoslav Ganov
c250400901
am 03037841: am 08681add: Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
...
* commit '03037841d4ccce4382ccbf55eddd96c427eb5861':
Day numbers in CalendarView have incorrect size.
2012-09-24 00:51:48 -07:00
Victoria Lease
c5d684a5ee
am 15edd2d5: am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
...
* commit '15edd2d5ad8ba17e183b5f1222ef39150df38397':
Get your own cursor Drawables, WebViewClassic!
2012-09-24 00:51:44 -07:00
Eino-Ville Talvala
5d0c5079ce
am eace371e: am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
...
* commit 'eace371ee01f8e61731d86110ec84258994eeded':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
2012-09-24 00:51:20 -07:00
Jeff Brown
d571122db5
am 1022a785: am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '1022a785e52384dc8503127df1ceaababcd88a1a':
Support HDMI hotplug.
2012-09-24 00:51:06 -07:00
Jim Miller
0b0c0efabf
am 998f94c9: am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
...
* commit '998f94c96afee8d3c76dcaf64f3f23dfdf8d8ce5':
Make DPM API for disabling keyguard widgets more generic
2012-09-24 00:50:28 -07:00
rich cannings
0f2714414a
am 83abadb0: am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
...
* commit '83abadb06a21ba54df6cc8a5c1f3c48253488430':
Add setting to skip verifying ADB installs
2012-09-24 00:49:36 -07:00
Daniel Sandler
3cfe94e792
am 89add82a: am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
...
* commit '89add82aa63af50cf407ff746baf92bd37336e02':
Fix javadocs to fix build.
2012-09-24 00:48:58 -07:00
John Spurlock
37a16ee466
am b8016f7a: am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
...
* commit 'b8016f7acecf8ff43b98c0285c7d9910577934aa':
Additions to Dream public api.
2012-09-24 00:48:48 -07:00
Jim Miller
26c5686b7e
Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev
2012-09-23 19:03:20 -07:00
Jeff Sharkey
49397ac93c
Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev
2012-09-23 18:25:47 -07:00
Jim Miller
b499884ba1
Better handling of multiple touch events in GlowPadView
...
This fixes a bug where a secondary touch event from the edge of the screen
would cause GlowPadView to choose the wrong target. The issue is resolved
by keeping track of pointer ids and only allowing the one that initiated
the gesture to complete it.
Fixes bug 7133500
Change-Id: If296b60af2421bfa1a9a082e608ba77b2392a218
2012-09-23 17:18:17 -07:00
Fabrice Di Meglio
f7a3e979a7
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-23 16:45:51 -07:00
Jeff Sharkey
752cd922f7
Always bind to DefaultContainerService as OWNER.
...
When PackageManagerService deals with external storage, always bind
to DefaultContainerService as USER_OWNER. This avoids binding to a
stopped user, which would fail.
Bug: 7203111
Change-Id: I8e303c7558e8b5cbe4fea0acc9a472b598df0caa
2012-09-23 16:44:34 -07:00
Fabrice Di Meglio
1a7d487380
Fix bug #6427629 Clean up layout direction APIs
...
- rename getResolvedTextAlignment() to getTextAlignment()
Change-Id: I6a2b6c9ec4f5cea1adde46e35d5f3c49880791ee
2012-09-23 16:19:58 -07:00
Fabrice Di Meglio
be4c5dd9d0
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-23 16:19:03 -07:00
Fabrice Di Meglio
97e146cf02
Fix bug #6427629 Clean up layout direction APIs
...
- rename getResolvedTextDirection() to getTextDirection()
Change-Id: Id2a6025daf5521dcd676e454fc6bb9955fdccf2d
2012-09-23 15:55:11 -07:00
Fabrice Di Meglio
239e430578
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-23 15:09:56 -07:00
Fabrice Di Meglio
e3f2ac9e52
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-23 15:05:56 -07:00
Fabrice Di Meglio
e56ffdc7b3
Fix bug #6427629 Clean up layout direction APIs
...
- rename getResolvedLayoutDirection() to getLayoutDirection()
Change-Id: I3afe56c0db0751952f5056c23893cb7455531d29
2012-09-23 14:51:16 -07:00
Fabrice Di Meglio
4457e85a70
Fix bug #6427629 Clean up layout direction APIs
...
- canResolveXxx() should be hidden
- resetResolvedXxx() should be hidden
- resolveDrawables(), resolveLayoutDirection(), resolvePadding(), resolveTextAlignment(), resolveTextDirection() should be hidden
- onResolvedXxx() should be merged into one callback
- fix also an issue with setting the layout direction of the drawable in ImageView
- fix also an issue with checking if TextAlignment can be resolved
Change-Id: I1402269ddf8632525f5550f80e5610e1a7b4034d
2012-09-23 14:15:26 -07:00
Dianne Hackborn
c0e1f26845
Merge "Fix issue #7184877 : Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev
2012-09-23 13:31:33 -07:00
Dianne Hackborn
3b84206bba
Fix issue #7184877 : Calendar Locksceen Widget crashes and forces phone to reboot
...
Don't kill the system uid if we are running out of RAM.
Change-Id: Ie1818a3241fc80d4dfa19f8e8bdad22d164d7baa
2012-09-23 13:29:44 -07:00