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
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
Jason Sams
ebe3bc596b am 260b7214: am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev 
* commit '260b72148e037c63b2c3984e6adf6aab052c2394':
  Add Blend intrinsic.
 2012-09-24 00:51:41 -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
Scott Main
915b7ea045 am 3352fb2f: am ec501466: am 2e642866: am be676b6c: am 4a5425db: fix layout bug 
* commit '3352fb2f7a7cead569ba4fefc5e0991f4205973d':
  fix layout bug
 2012-09-24 00:51:15 -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
Baligh Uddin
3cfd80cb84 am abe47311: (-s ours) am 063d15ff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'abe4731178fee236c3f1b602b01b46f0e7fa1b5a':
  Import translations. DO NOT MERGE
 2012-09-24 00:50:50 -07:00
Baligh Uddin
9a8ded11cf am 02ac4946: (-s ours) am 691b68b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '02ac49462d030116d7586eb0cfbba86c0e9ba601':
  Import translations. DO NOT MERGE
 2012-09-24 00:50:44 -07:00
Jim Miller
6a840865a4 am 2079e8a0: am 7478cf86: Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev 
* commit '2079e8a09aaacc17f56f9b586b7cb4c7c78f927e':
  Tweak keyguard security flip animation timing.
 2012-09-24 00:50:35 -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
Romain Guy
3961b1aef8 am cd1c4566: am 059aedf8: Merge "Finish this bit before I forget." into jb-mr1-dev 
* commit 'cd1c4566b8692e50985564fc45211f371f816b1f':
  Finish this bit before I forget.
 2012-09-24 00:50:06 -07:00
John Reck
ec6317e626 am 7f072188: am f98db0de: Merge "Improve find on page accessibility" into jb-mr1-dev 
* commit '7f07218881f2d0f8c7c5e60db92993596cb60cb0':
  Improve find on page accessibility
 2012-09-24 00:49:43 -07:00
Eric Laurent
1c4463121e am ed4c8b6d: am 2c0feeaf: Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev 
* commit 'ed4c8b6dfc1dc72c5efea8ad8f3aa166e712cbd6':
  Do not turn safe volume on upon headset connection
 2012-09-24 00:49:39 -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
Nick Kralevich
adaf334f52 am 1c7cabad: am 987f1e75: Merge "allowBackup doc fix." into jb-mr1-dev 
* commit '1c7cabad95ecd681f295552eda39588c506676a0':
  allowBackup doc fix.
 2012-09-24 00:49:20 -07:00
Derek Sollenberger
d04c9c5247 am 4305f6e6: am 642030e3: Merge "Ensure that the decoder is thread-safe." into jb-mr1-dev 
* commit '4305f6e682bdeceae5fee63415a332d6593bc14c':
  Ensure that the decoder is thread-safe.
 2012-09-24 00:49:15 -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
Winson Chung
cb49aba2ff am e8910d3b: am 3ed6f945: Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023) 
* commit 'e8910d3b782411568aed452c58ac301242ab9009':
  Showing QuickContacts card, adding brightness bar timeout and width, fixing wifi display icon visibility. (Bug 7186309, Bug 7175023)
 2012-09-24 00:48:42 -07:00
Dianne Hackborn
b939e35274 Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 2012-09-23 12:58:10 -07:00
Dianne Hackborn
8da429e80d Fix issue #7209355, #7214271. 
Issue #7209355: Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271: Crash in system UI

Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.

Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
 2012-09-23 12:53:34 -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
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
Baligh Uddin
b06fc5804b Merge "Import translations. DO NOT MERGE" 2012-09-23 07:31:01 -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
7e8629e263 Import translations. DO NOT MERGE 
Change-Id: I244fda6886a62748c81f54def31d8346646e21ee
Auto-generated-cl: translation import
 2012-09-22 13:04:44 -07:00
Baligh Uddin
bdb7eb0746 Import translations. DO NOT MERGE 
Change-Id: Ib052a7d57de985a3cd14b2d6ee7fb9f630ee29e9
Auto-generated-cl: translation import
 2012-09-22 12:57:32 -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
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