85453 Commits

Author SHA1 Message Date
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
Chet Haase
925b6a715f Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 2012-09-23 12:36:21 -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
Chet Haase
b92d8f7979 Optimize glyph cache texture uploads
Only upload the changed area of the glyph cache, not the entire
bitmap. Note that we can't do the full-on optimization here of copying a sub-rect
of the bitmap because of GL ES 2 limitations, but we can at least copy the
horizontal stripe containing the dirty rect, which can still be a big
savings over uploading the entire bitmap.

Issue #7158326 Bad framerates on MR1 (Mako, Manta, Prime)

Change-Id: Iab38d53202650f757ead4658cf4287bdad2b3cb9
2012-09-23 12:16:02 -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
Jason Sams
067af95257 Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 2012-09-23 11:02:11 -07:00
Jason Sams
ed0b4f961f Force destroy scripts in imageProcessing.
bug 7216044

Change-Id: I6292513c08e75269e79d2210de898ef28931c986
2012-09-23 10:59:35 -07:00
Baligh Uddin
9a8d94b27e Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-23 10:31:23 -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
Winson Chung
c4b16f1acb Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev 2012-09-22 14:37:02 -07:00
Baligh Uddin
58cfe3533f Import translations. DO NOT MERGE
Change-Id: Id113f09e3f1eeb3af8b4a1cf21daa21eb575f0fc
Auto-generated-cl: translation import
2012-09-22 13:02:59 -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
Jim Miller
1cd5522fcc Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev 2012-09-21 20:07:46 -07:00
Jim Miller
3fd47af32d Send USER_PRESENT for keyguard choice "None"
This enables sending ACTION_USER_PRESENT when the user has
selected "None" for their keyguard screen. When this happens,
we delegate sending the event to onScreenTurnedOn().

Tested:
- None -> sends broadcast in onSystemReady() the first time after boot
and in onScreenTurnedOn() there after.
- Slide -> sends broadcast only once when screen is dismissed
- Pattern -> sends broadcast only once when screen is dismissed

Fixes bug 7029707

Change-Id: I785c3255b15e2ee598a10d7d3580ba5c03dd0068
2012-09-21 20:06:50 -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
Dianne Hackborn
88923c973e Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 2012-09-21 18:47:18 -07:00
Dianne Hackborn
6a864959e0 Fix issue #7214462: Some recent thumbnails are black.
Change-Id: I9a2704c95a8701c9fb6755662fb47d4743099bf9
2012-09-21 18:46:11 -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
Svetoslav Ganov
9f12373b57 Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 2012-09-21 18:26:52 -07:00
Svetoslav Ganov
9371a0a0c0 Fixing a regression in the UI test automation.
bug:6967373

Change-Id: I28f01a2bfe44febcb1a519028dab82fb1da9753e
2012-09-21 18:20:42 -07:00