85622 Commits

Author SHA1 Message Date
Jason Sams
0db67cdb21 am ac4bd00c: Change 5x5 convolve to better test impl.
* commit 'ac4bd00c1fd68a9db3112cc16a48d84b4d02421a':
  Change 5x5 convolve to better test impl.
2012-09-24 08:48:02 -07:00
Fabrice Di Meglio
3e276b9966 am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit 'be4c5dd9d0b3ec1e020431f0e618a4cf38f9c57d':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-24 08:47:57 -07:00
Stephen Hines
e79b62925b am 9c7b5291: Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev
* commit '9c7b529125380de5721c1d5803d2e626a3e7ac17':
  Verify pass-by-value kernels with structs.
2012-09-24 08:47:52 -07:00
Wink Saville
8611f68a93 am 8a06969d: Merge "Refactor Cell Location public API." into jb-mr1-dev
* commit '8a06969d5be623d4efd3bdf2c3ecddcde557eca7':
  Refactor Cell Location public API.
2012-09-24 08:47:49 -07:00
Irfan Sheriff
41b409c9a5 am 335fff3f: Merge "P2p fixes" into jb-mr1-dev
* commit '335fff3fc99269e656446bbe700cca56079e1379':
  P2p fixes
2012-09-24 08:47:45 -07:00
Fabrice Di Meglio
8f3ba9fa1b am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit '239e430578fd2d3bd38a646595a82bca95359bd7':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-24 08:47:42 -07:00
Victoria Lease
f5f6bd66be am 17e3e9e5: Merge "Do not use passive GPS data for COARSE only apps." into jb-mr1-dev
* commit '17e3e9e53c5fb9c92c8972a8d92659c6bef85831':
  Do not use passive GPS data for COARSE only apps.
2012-09-24 08:47:38 -07:00
Fabrice Di Meglio
16c84db706 am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
* commit 'e3f2ac9e526e5b4de4d2ae113e644c1cb14b1ce6':
  Fix bug #6427629 Clean up layout direction APIs
2012-09-24 08:47:35 -07:00
Romain Guy
f0d3375b19 am d392b87e: Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev
* commit 'd392b87e3d30cd4f0836623d848019c5724efce8':
  Fix overdraw debug on QCOM
  Make sure we never bind to texture #0 Bug #7195815
2012-09-24 08:47:32 -07:00
Dianne Hackborn
a611a53292 am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev
* commit 'c0e1f268451550368d1d3d3558f8ce2459ed5713':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
2012-09-24 08:47:28 -07:00
Jeff Sharkey
7ba3dad8f0 am 5a370882: Merge "Check READ_EXTERNAL enforcement outside of lock." into jb-mr1-dev
* commit '5a370882f87321629f98f6149ac946a57e25dfa8':
  Check READ_EXTERNAL enforcement outside of lock.
2012-09-24 08:47:24 -07:00
Jeff Sharkey
e2bb66f64c am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev
* commit '11820f7386ce86fd89e9e6b49d9231dce6e1ed07':
  Allow acquiring ContentProviders across users.
2012-09-24 08:47:17 -07:00
Dianne Hackborn
66c86dd38b am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
2012-09-24 08:47:13 -07:00
Chet Haase
ff914e4c3e am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev
* commit '925b6a715f42296dee7d80c3a3b4024d264a3c97':
  Optimize glyph cache texture uploads
2012-09-24 08:47:09 -07:00
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
Jason Sams
f0ee7b6dbc am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev
* commit '067af95257e1f8007a3a1777c257760aed9947af':
  Force destroy scripts in imageProcessing.
2012-09-24 08:46:47 -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
Baligh Uddin
5d12f119bb am 7b770b0e: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '7b770b0ec4e5a1b7f1b9601433fb35e55658453d':
  Import translations. DO NOT MERGE
2012-09-24 08:46:37 -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
Winson Chung
7c7d78f60f am c4b16f1a: Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev
* commit 'c4b16f1acb3b81c7bdee36b48de01cd5d7a96d5b':
  Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)
2012-09-24 08:46:30 -07:00
Jim Miller
8146feea28 am 1cd5522f: Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev
* commit '1cd5522fcc16b6a7d38f7f4d2997359759196856':
  Send USER_PRESENT for keyguard choice "None"
2012-09-24 08:46:26 -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
Dianne Hackborn
bbb3bd9b7c am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev
* commit '88923c973e3b58593c4d0fb6724addcefc53004f':
  Fix issue #7214462: Some recent thumbnails are black.
2012-09-24 08:46:19 -07:00
Svetoslav Ganov
5acc556c26 am 9f12373b: Merge "Fixing a regression in the UI test automation." into jb-mr1-dev
* commit '9f12373b57bcd7e7c156306aee50ac4e4fdee58a':
  Fixing a regression in the UI test automation.
2012-09-24 08:46:15 -07:00
Adam Cohen
e886e6a423 am 993c3d79: Merge "Fixing typos" into jb-mr1-dev
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
2012-09-24 08:46:12 -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
Jason Sams
f5f2f1cd85 am 82c8cdab: Merge "Add run all button to image processing test." into jb-mr1-dev
* commit '82c8cdabc4161763cecaa9050bd2c544cc89e283':
  Add run all button to image processing test.
2012-09-24 08:46:05 -07:00
Jason Sams
0c158d61da am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev
* commit '7546b5ff1625d80296c0cdcb09ad28e037ab7fb6':
  Add Mandelbrot test to ImageProcessing.
2012-09-24 08:46:02 -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
The Android Open Source Project
18fd992b2d am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'a07cbb96f34198b6cfda05d39a02c9220a9722cf':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
2012-09-24 08:45:15 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
2012-09-24 08:45:14 -07:00
Kenny Root
c6f8a9985b Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev 2012-09-24 08:43:34 -07:00
The Android Open Source Project
a07cbb96f3 Reconcile with jb-mr0-release - do not merge
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
2012-09-24 07:39:06 -07:00
John Spurlock
2ce1ae8e63 Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 2012-09-24 05:52:46 -07:00
Bart Sears
562c45cc84 Updated versions of DroidSansFallback
Latest versions of DroidSansFallback from Monotype.

The DroidSansFallback.ttf file has some additional glyphs and
glyph fixes (including a fix for bug 6723057 and will likely fix
bug 6629748).  It continues to cover Korean Hangul but does not
cover CJK Ext A (for space reasons on small system image devices).
The DroidSansFallbackFull.ttf file has the bug fixes listed and
also removes the Korean Hangul because we are now going to use
NanumGothic for Korean (NanumGothic.ttf is added in a separate
CL in the external/naver-fonts directory).

The falback_fonts.xml file has been modified to add NanumGothic.ttf
before DroidSansFallback.

Bug: 4531601
Bug: 6723057
Bug: 6629748
Change-Id: I670d33078b4a97c4eda00fc2323be187696e927a
2012-09-24 00:32:57 -07:00
Daniel Sandler
3ffdcc70c2 Properly launch quicksettings activities.
- As current user
 - Dismissing keyguard if necessary
 - Dismissing all status bar windows and panels

Also move some QS-specific stuff out of PanelView and into
SettingsPanelView.

Bug: 7217006
Change-Id: I4d8ac84cc0f43e78f70553599c3207305c4f5c74
2012-09-24 00:43:51 -04: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
Romain Guy
6b3292ce5b Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 2012-09-23 17:50:06 -07:00
Romain Guy
97dc9172b0 Avoid deadlock when deleting layers
Bug #7217459

Change-Id: I12bfa6c30c5030bd1b23ea6a3ce64240ab1dfba3
2012-09-23 17:49:24 -07:00
Irfan Sheriff
916b2b5a93 Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 2012-09-23 17:32:07 -07:00
Irfan Sheriff
2c2ca5cb7c Increase WFD connect time out to 60s
The worst case WPS timeout for GO negotiation is two minutes.
Until, we better handle cancelling/disconnecting and re-syncing the
WFD framework with the wifi direct framework/supplicant, increase
the time out to 60s to help with dogfood

Bug: 7217600
Change-Id: I1ba0d9963b957454e2c6f47bfdf05176dea07be7
2012-09-23 17:30:19 -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