Chet Haase
95c8534ae9
am dbb26145: Merge "Optimize shaders for dithered gradients" into jb-mr1-dev
...
* commit 'dbb261455b1b8d2fdf4f0f8ad84ddb09dda1ed9b':
Optimize shaders for dithered gradients
2012-09-21 17:17:34 -07:00
Adam Cohen
d6a766abaf
am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
...
* commit '172cb769641c828d7ad20669a5f7c9533248382f':
Fixing onRestoreInstanceState crash in Launcher
2012-09-21 17:15:45 -07:00
Chet Haase
dbb261455b
Merge "Optimize shaders for dithered gradients" into jb-mr1-dev
2012-09-21 17:12:48 -07:00
Adam Cohen
172cb76964
Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
2012-09-21 17:11:38 -07:00
Dianne Hackborn
033e60e87a
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:08:37 -07:00
Dianne Hackborn
c9e94ea645
Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
2012-09-21 17:05:47 -07:00
Dianne Hackborn
52c62344c5
Fix issue #7213113 : Remove old intent resolver
...
Also make the query package restart broadcast protected like the
documentation says it should be.
Change-Id: I445166111318a02f2f2b1ab0dff9c641a441c20b
2012-09-21 17:04:16 -07:00
Adam Cohen
dce1791710
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 16:59:18 -07:00
Svetoslav Ganov
a586a3c9a7
am 38533ea5: Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
...
* commit '38533ea514a452d0fa3aa38557f6e461cb46f402':
NPE in AcitivtyChooserModel.
2012-09-21 16:57:37 -07:00
Adam Cohen
6ccf4e2791
Fixing onRestoreInstanceState crash in Launcher
...
-> Issue 7084152
Change-Id: Ic91074adfff5918e6471c861313a51d0a179ad08
2012-09-21 16:56:51 -07:00
Adam Cohen
8562cb5982
Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev
2012-09-21 16:56:31 -07:00
Svetoslav Ganov
38533ea514
Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
2012-09-21 16:55:29 -07:00
Adam Cohen
bd1e0076c6
Changing public method to @hide, doesn't have to be public
...
Change-Id: I4c87b154fd99376a0337f9fc65024e13ddb74da5
2012-09-21 16:51:50 -07:00
Svetoslav Ganov
03037841d4
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 16:34:50 -07:00
Svetoslav Ganov
08681adda0
Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
2012-09-21 16:32:02 -07:00
Victoria Lease
15edd2d5ad
am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
...
* commit 'b77b3cfe41d0bca459040a68759a68f9ecc1f478':
Get your own cursor Drawables, WebViewClassic!
2012-09-21 16:31:09 -07:00
Victoria Lease
b77b3cfe41
Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
2012-09-21 16:29:43 -07:00
Jason Sams
260b72148e
am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev
...
* commit '7b3132d97a2a28093f139dc884cb4d43de65af50':
Add Blend intrinsic.
2012-09-21 16:27:25 -07:00
Jason Sams
7b3132d97a
Merge "Add Blend intrinsic." into jb-mr1-dev
2012-09-21 16:24:07 -07:00
Chet Haase
a1d12dd619
Optimize shaders for dithered gradients
...
It's faster to compute a dither calculation in the vertex shader and use
a varying (letting the GPU interpolate the fragment values) than to perform
that calculation in the fragment shader as part of a texture lookup.
Issue #7207600 Prime mr1 shader performance issues
Issue #7158326 Bad framerates on MR1 (Mako, Manta, Prime)
Change-Id: I15789582a6e9e2d8b9dd22aa5b0f72f0ba1cce7f
2012-09-21 16:20:57 -07:00
Jason Sams
f70bb04346
Add Blend intrinsic.
...
Change-Id: I6f679c910fc23fe7441e17ad66bcf5f3dd7425a0
2012-09-21 16:10:49 -07:00
Eino-Ville Talvala
eace371ee0
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 16:08:57 -07:00
Eino-Ville Talvala
5ce25d7170
Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
2012-09-21 16:05:59 -07:00
Scott Main
3352fb2f7a
am ec501466: am 2e642866: am be676b6c: am 4a5425db: fix layout bug
...
* commit 'ec501466ea78758de4e0ab8057713c697829c2ec':
fix layout bug
2012-09-21 16:05:44 -07:00
Scott Main
ec501466ea
am 2e642866: am be676b6c: am 4a5425db: fix layout bug
...
* commit '2e6428668c97826e169e51ac5d0a7c6e8ba3bd79':
fix layout bug
2012-09-21 16:03:39 -07:00
Scott Main
2e6428668c
am be676b6c: am 4a5425db: fix layout bug
...
* commit 'be676b6cc4a2a594dcb1fb233539cf927f0b49e5':
fix layout bug
2012-09-21 16:00:51 -07:00
Scott Main
be676b6cc4
am 4a5425db: fix layout bug
...
* commit '4a5425dbd29329aaffbab3bb83c33bd437958237':
fix layout bug
2012-09-21 15:59:04 -07:00
Scott Main
4a5425dbd2
fix layout bug
...
Change-Id: Ibf3f04d6c2077c77b75076c02312d3b2dea394eb
2012-09-21 15:55:15 -07:00
Jeff Brown
1022a785e5
am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '3ca5971339c7eba61388aa3e26a1b3d02c5ccdf6':
Support HDMI hotplug.
2012-09-21 15:54:25 -07:00
Jeff Brown
3ca5971339
Merge "Support HDMI hotplug." into jb-mr1-dev
2012-09-21 15:51:41 -07:00
Baligh Uddin
abe4731178
am 063d15ff: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '063d15ff48c455203d4b7c2fb973ba081489c4ba':
Import translations. DO NOT MERGE
2012-09-21 15:46:16 -07:00
Baligh Uddin
063d15ff48
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-21 15:43:54 -07:00
Baligh Uddin
02ac49462d
am 691b68b0: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '691b68b0d5f89e695c77ddd20367556ff663ea2c':
Import translations. DO NOT MERGE
2012-09-21 15:35:10 -07:00
Jeff Brown
e87bf03076
Support HDMI hotplug.
...
Bug: 7206678
Change-Id: Ia5212b16658a5f5a2ccf8528eca7bebd45ca857a
2012-09-21 15:34:32 -07:00
Baligh Uddin
691b68b0d5
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-09-21 15:32:51 -07:00
Jim Miller
2079e8a09a
am 7478cf86: Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev
...
* commit '7478cf86cec2cd994518492df01a6fdac062cd14':
Tweak keyguard security flip animation timing.
2012-09-21 15:25:54 -07:00
Jim Miller
998f94c96a
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 15:24:05 -07:00
Jim Miller
7478cf86ce
Merge "Tweak keyguard security flip animation timing." into jb-mr1-dev
2012-09-21 15:23:34 -07:00
Jim Miller
1ed9fa10de
Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
2012-09-21 15:21:33 -07:00
Romain Guy
cd1c4566b8
am 059aedf8: Merge "Finish this bit before I forget." into jb-mr1-dev
...
* commit '059aedf808c8b9b3da1457eef52f3d477878d50b':
Finish this bit before I forget.
2012-09-21 15:10:23 -07:00
Romain Guy
059aedf808
Merge "Finish this bit before I forget." into jb-mr1-dev
2012-09-21 15:08:12 -07:00
Romain Guy
f7e52d92b4
Finish this bit before I forget.
...
This code is not enabled in current builds.
Change-Id: I488ec9e94889efbf2c8f3312abfed4298a76b7f1
2012-09-21 15:06:52 -07:00
John Reck
7f07218881
am f98db0de: Merge "Improve find on page accessibility" into jb-mr1-dev
...
* commit 'f98db0de2248ad286b207eed6a826373cc60b786':
Improve find on page accessibility
2012-09-21 14:56:00 -07:00
Eric Laurent
ed4c8b6dfc
am 2c0feeaf: Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev
...
* commit '2c0feeaffc89ef1f9b7b81074d0f5c9cbb97fc6b':
Do not turn safe volume on upon headset connection
2012-09-21 14:55:56 -07:00
rich cannings
83abadb06a
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 14:55:52 -07:00
John Reck
f98db0de22
Merge "Improve find on page accessibility" into jb-mr1-dev
2012-09-21 14:18:15 -07:00
Baligh Uddin
2be31d890a
Import translations. DO NOT MERGE
...
Change-Id: I84b2f0c629da551293130a0a31024b4bf8172d56
Auto-generated-cl: translation import
2012-09-21 14:12:27 -07:00
John Reck
26d48a7607
Improve find on page accessibility
...
Bug: 6827306
Change-Id: I09fe5736b53e0da499ea08a13c1e7a9e56486af7
2012-09-21 14:04:19 -07:00
Eric Laurent
2c0feeaffc
Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev
2012-09-21 13:55:46 -07:00
Baligh Uddin
15cd68517e
Import translations. DO NOT MERGE
...
Change-Id: Ie49c391d083e0b3be0fab541180e09aae3d04142
Auto-generated-cl: translation import
2012-09-21 13:54:12 -07:00