drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,606 Commits 1 Branch 0 Tags
Commit Graph

87606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chet Haase
70c75cea88 am 21755bf5: am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 
* commit '21755bf51ce71a9ee6d1841af0e15f776dee9855':
  Optimize glyph cache texture uploads
 2012-09-24 09:38:19 -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
Adam Powell
5210aa3f58 am 140c78f7: am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev 
* commit '140c78f77c5a611953168fdac4dd122d16610494':
  Further tweak config_minScalingSpan for large screen devices
 2012-09-24 09:38:12 -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
Jason Sams
07e37dfac9 am 7e2048be: am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 
* commit '7e2048beb2195a24bdcb76be505eb0070cb2c9f7':
  Force destroy scripts in imageProcessing.
 2012-09-24 09:37:58 -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
Baligh Uddin
aa11714664 am 3ad3cc49: (-s ours) am 7b770b0e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '3ad3cc49706bf87ec129195b0d731b37adad958b':
  Import translations. DO NOT MERGE
 2012-09-24 09:37:50 -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
Winson Chung
0e604e6c79 am 3ce29376: am c4b16f1a: Merge "Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)" into jb-mr1-dev 
* commit '3ce29376f31344809d6369c0cd421be4fca38c89':
  Fixing various QuickSettings issues (Bug 7210343, Bug 7174839, Bug 7174738)
 2012-09-24 09:37:42 -07:00
Jim Miller
6513af38a7 am 9c8a97e6: am 1cd5522f: Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev 
* commit '9c8a97e626213f8063d71072a36aa192bdf72470':
  Send USER_PRESENT for keyguard choice "None"
 2012-09-24 09:37:38 -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
Dianne Hackborn
79cc83f8d8 am 6e40deb8: am 88923c97: Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev 
* commit '6e40deb81cbee41f4f4611f30854bd1d8a928d53':
  Fix issue #7214462: Some recent thumbnails are black.
 2012-09-24 09:37:31 -07:00
Svetoslav Ganov
0f85c577f5 am 66b6dc69: am 9f12373b: Merge "Fixing a regression in the UI test automation." into jb-mr1-dev 
* commit '66b6dc69644d7d232ce4b4490eca2c1d7659bb98':
  Fixing a regression in the UI test automation.
 2012-09-24 09:37:27 -07:00
Adam Cohen
4ae5254372 am a035cdac: am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit 'a035cdac93cf0519d6d81b4d6f3edbb442fa9ba8':
  Fixing typos
 2012-09-24 09:37:23 -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
Jason Sams
ff8e158801 am e7812aa7: am 82c8cdab: Merge "Add run all button to image processing test." into jb-mr1-dev 
* commit 'e7812aa7193a7e8ee1a16af58455f85073d1264a':
  Add run all button to image processing test.
 2012-09-24 09:37:16 -07:00
Jason Sams
b86f5848ad am 4645a871: am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev 
* commit '4645a871780122678b9bb09b72728a2d7d9728b0':
  Add Mandelbrot test to ImageProcessing.
 2012-09-24 09:37:12 -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
Dianne Hackborn
2552e78a15 am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
 2012-09-24 09:28:18 -07:00
Chet Haase
21755bf51c am 925b6a71: Merge "Optimize glyph cache texture uploads" into jb-mr1-dev 
* commit '925b6a715f42296dee7d80c3a3b4024d264a3c97':
  Optimize glyph cache texture uploads
 2012-09-24 09:28:14 -07:00
Brian Carlstrom
e308973644 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 09:28:11 -07:00
Adam Powell
140c78f77c 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 09:28:07 -07:00
Fabrice Di Meglio
443e3f0b7e am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '57d863c3c28e13ac299fda8ba30bf1d6644230c8':
  Fix the build
 2012-09-24 09:28:03 -07:00
Fabrice Di Meglio
a478de98a3 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 09:27:59 -07:00
Fabrice Di Meglio
e477ff0cde 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 09:27:56 -07:00
Jason Sams
7e2048beb2 am 067af952: Merge "Force destroy scripts in imageProcessing." into jb-mr1-dev 
* commit '067af95257e1f8007a3a1777c257760aed9947af':
  Force destroy scripts in imageProcessing.
 2012-09-24 09:27:52 -07:00
Eino-Ville Talvala
899d1efa4e 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 09:27:48 -07:00
Baligh Uddin
3ad3cc4970 am 7b770b0e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '7b770b0ec4e5a1b7f1b9601433fb35e55658453d':
  Import translations. DO NOT MERGE
 2012-09-24 09:27:44 -07:00
Wu-cheng Li
9058a26588 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 09:27:40 -07:00
Winson Chung
3ce29376f3 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 09:27:32 -07:00
Jim Miller
9c8a97e626 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 09:27:28 -07:00
Romain Guy
454f2be11f 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 09:27:24 -07:00
Dianne Hackborn
6e40deb81c 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 09:27:20 -07:00
Svetoslav Ganov
66b6dc6964 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 09:27:17 -07:00
Adam Cohen
a035cdac93 am 993c3d79: Merge "Fixing typos" into jb-mr1-dev 
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
 2012-09-24 09:27:13 -07:00
Amith Yamasani
56be4dd85f 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 09:27:08 -07:00
Jason Sams
e7812aa719 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 09:27:04 -07:00
Jason Sams
4645a87178 am 7546b5ff: Merge "Add Mandelbrot test to ImageProcessing." into jb-mr1-dev 
* commit '7546b5ff1625d80296c0cdcb09ad28e037ab7fb6':
  Add Mandelbrot test to ImageProcessing.
 2012-09-24 09:27:01 -07:00
Eino-Ville Talvala
35f0ee6489 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 09:26:57 -07:00
Jim Miller
99b0d43645 am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev 
* commit '6eeff850b245bd3be3a0e782cd9f28daadf922dc':
  Remove UID checks from LockPatternUtils
 2012-09-24 09:26:53 -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
Chet Haase
dca39563d9 am 95c8534a: am dbb26145: Merge "Optimize shaders for dithered gradients" into jb-mr1-dev 
* commit '95c8534ae915c0d084305b247b37dab940f29da1':
  Optimize shaders for dithered gradients
 2012-09-24 00:52:19 -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