Brian Carlstrom
ea28e107c3
am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
...
* commit '5a009dcc58a46c41f1b54ccffca7d1317bbbff18':
Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
2012-09-24 08:47:05 -07:00
Adam Powell
ec01f0e7b5
am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev
...
* commit 'bda527eca601b27ae66b6a93819cbe934e5ec782':
Further tweak config_minScalingSpan for large screen devices
2012-09-24 08:47:02 -07:00
Fabrice Di Meglio
2d03704c0f
am 57d863c3: Merge "Fix the build" into jb-mr1-dev
...
* commit '57d863c3c28e13ac299fda8ba30bf1d6644230c8':
Fix the build
2012-09-24 08:46:59 -07:00
Fabrice Di Meglio
4aadafb830
am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev
...
* commit '415f26b73c90d07b9ec232ae4bd6bec59b28ddf8':
Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
2012-09-24 08:46:54 -07:00
Fabrice Di Meglio
4a3a6d11d0
am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
...
* commit '5c2591e6eff3233c7f9c5bbae0dd20c1320f0854':
Fix bug #7206086 NumberPicker widget should use locale digits
2012-09-24 08:46:51 -07:00
Eino-Ville Talvala
2cd624d9d3
am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
...
* commit 'a91c9f9f7a3c5d09333bdf27ef06012bb4e7d710':
Unhide and document feature android.hardware.camera.any.
2012-09-24 08:46:42 -07:00
Wu-cheng Li
4358c93892
am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
...
* commit '29f5230dc604537a72842a70991bae71019f8c80':
Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
2012-09-24 08:46:34 -07:00
Romain Guy
b29e4a20a5
am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev
...
* commit '8e586f61dd4f7fa53b01e63ac779ffc7cde05bdd':
Add support for a new developer setting: overdraw debugging
2012-09-24 08:46:23 -07:00
Amith Yamasani
018824cab0
am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev
...
* commit '77e95d3d71f10a0d936445e3f3ed90e15c019024':
Show lockscreen widgets for the current user.
2012-09-24 08:46:08 -07:00
Eino-Ville Talvala
40279c0c28
am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
...
* commit 'c9108b1856c7b6d98ddc04fbe330df21f2da890d':
Add hardware feature android.hardware.camera.any.
2012-09-24 08:45:58 -07:00
Jim Miller
da2d69c1dc
am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev
...
* commit '6eeff850b245bd3be3a0e782cd9f28daadf922dc':
Remove UID checks from LockPatternUtils
2012-09-24 08:45:55 -07:00
Brian Carlstrom
5a009dcc58
Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
2012-09-23 12:25:31 -07:00
Adam Powell
bda527eca6
Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev
2012-09-23 12:05:23 -07:00
Fabrice Di Meglio
57d863c3c2
Merge "Fix the build" into jb-mr1-dev
2012-09-23 12:00:03 -07:00
Adam Powell
c96a7fba2d
Further tweak config_minScalingSpan for large screen devices
...
Change-Id: Ibad70e41eed0e20f399dab275ac156eceed9d52f
2012-09-23 11:59:57 -07:00
Fabrice Di Meglio
a65fe884d1
Fix the build
...
Change-Id: Ia021742fb33671f9ece48180789757297fa60001
2012-09-23 11:54:51 -07:00
Fabrice Di Meglio
415f26b73c
Merge "Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales" into jb-mr1-dev
2012-09-23 11:11:52 -07:00
Fabrice Di Meglio
5c2591e6ef
Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
2012-09-23 11:10:40 -07:00
Eino-Ville Talvala
a91c9f9f7a
Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
2012-09-23 10:14:22 -07:00
Baligh Uddin
7b770b0ec4
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-23 09:32:24 -07:00
Wu-cheng Li
29f5230dc6
Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
2012-09-23 02:21:17 -07:00
Baligh Uddin
4e1c866cc6
Import translations. DO NOT MERGE
...
Change-Id: Iaf8ab463bb0de67a3b6ee0f903d00d6b12a89dfc
Auto-generated-cl: translation import
2012-09-22 12:50:22 -07:00
Baligh Uddin
a7f8a42f74
Import translations. DO NOT MERGE
...
Change-Id: If3770c770718fff6f1f15a15d3086b7ba9c9bb3f
Auto-generated-cl: translation import
2012-09-22 12:48:59 -07:00
Romain Guy
8e586f61dd
Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev
2012-09-21 19:28:06 -07:00
Romain Guy
7c450aaa3c
Add support for a new developer setting: overdraw debugging
...
Change-Id: I350ba4486577c3289f82c20938f7a35138778727
2012-09-21 19:15:00 -07:00
Fabrice Di Meglio
550ea7f546
Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
...
Change-Id: Iacd1718be054b4405ea0c769f695044faf4254b6
2012-09-21 18:54:53 -07:00
Fabrice Di Meglio
d88e3054d0
Fix bug #7206086 NumberPicker widget should use locale digits
...
- fix for having the TwoDigitFormatter being able to be recreated if the locale is changed
- accept now also the Arabic and Persian digits
Change-Id: Ifbf7e274d971008f4a5782402d4b76d9472b68fc
2012-09-21 18:42:47 -07:00
Amith Yamasani
77e95d3d71
Merge "Show lockscreen widgets for the current user." into jb-mr1-dev
2012-09-21 18:16:49 -07:00
Amith Yamasani
8fd96ec2dc
Show lockscreen widgets for the current user.
...
Also shows the owner info and next alarm for the current user.
AppWidgetService now assumes that any widgets running in the system process are for the
current user, so that lockscreen shows widgets for the current user
Bug: 7211754
Bug: 7212421
Change-Id: Iaf0edc60e49af0afe42625c0b2dcf100c9ecc178
2012-09-21 18:10:34 -07:00
Eino-Ville Talvala
c9108b1856
Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
2012-09-21 17:57:03 -07:00
Svetoslav Ganov
31a2b8c7bf
am 0a5c5567: Merge "Multi-user support for the accessibility layer." into jb-mr1-dev
...
* commit '0a5c5567f2d7e203d95c80a8d3353d0acd98b5f9':
Multi-user support for the accessibility layer.
2012-09-21 17:50:51 -07:00
Adam Cohen
5664595667
am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
...
* commit '172cb769641c828d7ad20669a5f7c9533248382f':
Fixing onRestoreInstanceState crash in Launcher
2012-09-21 17:50:42 -07:00
Dianne Hackborn
f3d2608939
am c9e94ea6: Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
...
* commit 'c9e94ea6451958fce107580b54c183181de6aa22':
Fix issue #7213113 : Remove old intent resolver
2012-09-21 17:50:36 -07:00
Adam Cohen
24694468d8
am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev
...
* commit '8562cb59825a9ccff2b019d2c30f38c8798ca3a1':
Changing public method to @hide, doesn't have to be public
2012-09-21 17:50:31 -07:00
Svetoslav Ganov
b2c6e8a1f0
am 38533ea5: Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
...
* commit '38533ea514a452d0fa3aa38557f6e461cb46f402':
NPE in AcitivtyChooserModel.
2012-09-21 17:50:26 -07:00
Svetoslav Ganov
e54a67d2fd
am 08681add: Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
...
* commit '08681adda06f4699f85838861170fbb062c9fdfe':
Day numbers in CalendarView have incorrect size.
2012-09-21 17:50:18 -07:00
Victoria Lease
b03a3d1c69
am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
...
* commit 'b77b3cfe41d0bca459040a68759a68f9ecc1f478':
Get your own cursor Drawables, WebViewClassic!
2012-09-21 17:50:14 -07:00
Eino-Ville Talvala
09a792c7fd
am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
...
* commit '5ce25d717059c9c37618aa349314077f99ac34c7':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
2012-09-21 17:49:51 -07:00
Jeff Brown
919a4cdfe2
am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
Support HDMI hotplug.
2012-09-21 17:49:35 -07:00
Jim Miller
3b2cc5d011
am 7478cf86: Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev
...
* commit '7478cf86cec2cd994518492df01a6fdac062cd14':
Tweak keyguard security flip animation timing.
2012-09-21 17:49:06 -07:00
Jim Miller
f084208bdf
am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
...
* commit '1ed9fa10de3e94678ddb2929936caa3ff4164cf8':
Make DPM API for disabling keyguard widgets more generic
2012-09-21 17:49:00 -07:00
John Reck
2bb2b24ef1
am f98db0de: Merge "Improve find on page accessibility" into jb-mr1-dev
...
* commit 'f98db0de2248ad286b207eed6a826373cc60b786':
Improve find on page accessibility
2012-09-21 17:48:24 -07:00
rich cannings
3b7f3cbfe8
am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
...
* commit '04c2bb86ca47378c99576c5ff7cb8283683dc935':
Add setting to skip verifying ADB installs
2012-09-21 17:48:17 -07:00
Nick Kralevich
c11f1198a4
am 987f1e75: Merge "allowBackup doc fix." into jb-mr1-dev
...
* commit '987f1e759c8f6c2a69d7973b472031f3210ff5cb':
allowBackup doc fix.
2012-09-21 17:48:04 -07:00
Daniel Sandler
0ab7b9d0f8
am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
...
* commit 'df655d09c0dc4ce12ba4b191c1ebb888f123a3b1':
Fix javadocs to fix build.
2012-09-21 17:47:46 -07:00
John Spurlock
7492091128
am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
...
* commit '2250550187ed7a2bd98d5f861151b49db5635f6e':
Additions to Dream public api.
2012-09-21 17:47:36 -07:00
Dianne Hackborn
a0708b230d
am 739bc9e3: Merge "Fix issue #7205845 : Permissions screen: make "New" text blue instead of red" into jb-mr1-dev
...
* commit '739bc9e3f51c203fc0b58c30d67cacda985e95c6':
Fix issue #7205845 : Permissions screen: make "New" text blue instead of red
2012-09-21 17:47:03 -07:00
Romain Guy
18c166bcd6
am 3f7c246f: Merge "Update layers in a single batch at the beginning of a frame Bug #7186819 " into jb-mr1-dev
...
* commit '3f7c246f3ea85af9fb98cba37387bb55658d4614':
Update layers in a single batch at the beginning of a frame Bug #7186819
2012-09-21 17:46:55 -07:00
Bjorn Bringert
3661ee1e8b
am 45b07b94: Merge "Add intents to open text and video from search." into jb-mr1-dev
...
* commit '45b07b9427cc736bf4fd5658ef2f30884ba4d9a4':
Add intents to open text and video from search.
2012-09-21 17:46:43 -07:00
Dan Morrill
26cee9f355
am 466bd636: Merge "New method returning user metadata." into jb-mr1-dev
...
* commit '466bd636812684aeb8161f144597cc3b3ed39078':
New method returning user metadata.
2012-09-21 17:46:29 -07:00