Adam Powell
d2c48f88ce
am 12230eaa: Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
...
* commit '12230eaa5f446cb22032d6645074a1aaca146df9':
Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator
2011-03-09 00:25:10 -08:00
Adam Powell
eb4569e01f
Merge "Fix bug 4065021 - Adjust spacing of the "home" action bar item to be consistent with the "up" indicator" into honeycomb-mr1
2011-03-09 00:22:53 -08:00
Romain Guy
61e29d0951
am 812dba1f: Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
...
* commit '812dba1fcaa1a374124c2fe0694c1b4f21e3dea9':
Prevents NPE when a View was detached Bug #4068284
2011-03-08 23:53:06 -08:00
Romain Guy
7dce7e09da
Merge "Prevents NPE when a View was detached Bug #4068284 " into honeycomb-mr1
2011-03-08 23:51:02 -08:00
Adam Powell
6ab86468be
am 1250c94b: Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
...
* commit '1250c94b50a3322e44c8ded7ab15bd6da9cc82a7':
Bug 3509417 - Refine touch event serialization
2011-03-08 20:02:44 -08:00
Adam Powell
9b1a1eaa12
Merge "Bug 3509417 - Refine touch event serialization" into honeycomb-mr1
2011-03-08 20:00:25 -08:00
Nicolas Roard
ba3af39374
am f986d496: Merge "Partial invalidation of the browser textures" into honeycomb-mr1
...
* commit 'f986d496c56fc8ae44b03f982e3e1ed437cdb996':
Partial invalidation of the browser textures
2011-03-08 19:06:17 -08:00
Nicolas Roard
e0c413fbe7
Merge "Partial invalidation of the browser textures" into honeycomb-mr1
2011-03-08 19:02:33 -08:00
Scott Main
6ddae8a7d9
am 57e42c37: am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit '57e42c372698e38195640ac2130c19206082fcb0':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 18:40:04 -08:00
Scott Main
db4edcd384
am b0355410: docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
...
* commit 'b0355410bb161c5e61408e57dc2adc085d337be9':
docs: replace misc screenshots from Mac with shots from Windows bug: 3490831
2011-03-08 18:37:37 -08:00
Amith Yamasani
9c2c09041b
am 1f111f11: Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
...
* commit '1f111f11721d5d550f45135ba193c465e59a635b':
Searchview layout cleanup. Some more tweaks required for Market.
2011-03-08 16:36:47 -08:00
Amith Yamasani
e0c5644b51
Merge "Searchview layout cleanup. Some more tweaks required for Market." into honeycomb-mr1
2011-03-08 16:34:11 -08:00
Jim Miller
0f491a733f
am 3de6a9b6: Merge "Fix 4025684: Don\'t include wallpaper dimensions in bounds calculation" into honeycomb-mr1
...
* commit '3de6a9b692437d5ce14d672cad4eff4c7ed0ae23':
Fix 4025684: Don't include wallpaper dimensions in bounds calculation
2011-03-08 15:46:22 -08:00
Dianne Hackborn
45ecb79c00
am 09a31662: Merge "Fix issue #3505861 : Need to decide large/xlarge screen size limits" into honeycomb-mr1
...
* commit '09a31662055605e90d6e81e06437de0d92c7cf95':
Fix issue #3505861 : Need to decide large/xlarge screen size limits
2011-03-08 15:44:10 -08:00
Jim Miller
eb0f6cbfc7
Merge "Fix 4025684: Don't include wallpaper dimensions in bounds calculation" into honeycomb-mr1
2011-03-08 15:43:16 -08:00
Dianne Hackborn
7e388b2289
Merge "Fix issue #3505861 : Need to decide large/xlarge screen size limits" into honeycomb-mr1
2011-03-08 15:41:24 -08:00
Justin Ho
7509f93a4b
am 7b27dc12: Merge "Updated text cursor assets" into honeycomb-mr1
...
* commit '7b27dc1201b10e40bcd9fbc73482640ccc15a6bf':
Updated text cursor assets
2011-03-08 15:35:47 -08:00
Justin Ho
f7441b69eb
Merge "Updated text cursor assets" into honeycomb-mr1
2011-03-08 15:34:15 -08:00
Xavier Ducrohet
319ef02178
am f596d697: Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
...
* commit 'f596d697b69705daa7bc21485659bd704ec5d52e':
LayoutLib: fix Capabilities and getDimensionPixelSize
2011-03-08 15:27:25 -08:00
Xavier Ducrohet
37ea7b37c3
Merge "LayoutLib: fix Capabilities and getDimensionPixelSize" into honeycomb-mr1
2011-03-08 15:25:08 -08:00
Adam Cohen
6183339e01
am f10615d8: Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
...
* commit 'f10615d8d86f4324bf5f6b5a2eb2874cc2b5ef3d':
Fixing inconsistency between invalidate region and draw region
2011-03-08 15:02:34 -08:00
Adam Cohen
190ab8bdb7
Merge "Fixing inconsistency between invalidate region and draw region" into honeycomb-mr1
2011-03-08 14:59:51 -08:00
Andy Stadler
8d30d91cb4
am c9e59899: Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
...
* commit 'c9e598995db68cf97dc3ed0fc527a35e2d966afd':
Clarify rules about encryption of emulated storage.
2011-03-08 14:53:06 -08:00
Romain Guy
c4aa42847a
am 3d7796c1: Merge "Correctly handle opaque fading views Bug #3475554 " into honeycomb-mr1
...
* commit '3d7796c17ffae7892d1987053c3b6698697cffa2':
Correctly handle opaque fading views Bug #3475554
2011-03-08 14:53:01 -08:00
Jim Miller
d9c23bfa12
am ccdeb60c: Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
...
* commit 'ccdeb60cb6bfe7fec77a787e03557927fb55080c':
Fix 4025690,4027061: Minor tweaks to recent applications layouts
2011-03-08 14:52:57 -08:00
Andy Stadler
37a29c7057
Merge "Clarify rules about encryption of emulated storage." into honeycomb-mr1
2011-03-08 14:50:32 -08:00
Romain Guy
a8cc6e231c
Merge "Correctly handle opaque fading views Bug #3475554 " into honeycomb-mr1
2011-03-08 14:49:54 -08:00
Jim Miller
96e8f6e7f1
Merge "Fix 4025690,4027061: Minor tweaks to recent applications layouts" into honeycomb-mr1
2011-03-08 14:49:47 -08:00
Huahui Wu
73ac75243e
am 8496ddc5: Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
...
* commit '8496ddc536eb917c813b7928f174c828d2275ada':
b/3307761 Tuning two fingers pan.
2011-03-08 14:44:39 -08:00
Huahui Wu
594429b250
Merge "b/3307761 Tuning two fingers pan." into honeycomb-mr1
2011-03-08 14:40:50 -08:00
John Reck
bde1a2da7a
am 39184a08: Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1
...
* commit '39184a08099e0b8fc799a75445ad0a7814bd48ac':
In xlarge, use "tab" instead of "window"
2011-03-08 12:30:32 -08:00
John Reck
cd8a3fb82a
Merge "In xlarge, use "tab" instead of "window"" into honeycomb-mr1
2011-03-08 12:28:07 -08:00
Xavier Ducrohet
a127c2dafb
am c040eb20: Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
...
* commit 'c040eb20a8e8c1bef134490d71568fe2546d0f55':
LayoutLib: Fix dimension parsing to handle negative value.
2011-03-08 11:55:00 -08:00
Xavier Ducrohet
90c4cf6a96
Merge "LayoutLib: Fix dimension parsing to handle negative value." into honeycomb-mr1
2011-03-08 11:53:04 -08:00
Mathias Agopian
4c90862481
am de6a47a3: (-s ours) am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only" into gingerbread
...
* commit 'de6a47a3e9d1a8cb5722b9785f5ffb9046c23918':
Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) only
2011-03-08 11:34:16 -08:00
Xavier Ducrohet
947daf6c42
am 687fe203: Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
...
* commit '687fe2038780aa52bc370a903b08305de4d85647':
LayoutLib: Implement some missing add###() method in Path.
2011-03-08 11:24:33 -08:00
Xavier Ducrohet
2c25c32a45
Merge "LayoutLib: Implement some missing add###() method in Path." into honeycomb-mr1
2011-03-08 11:22:46 -08:00
Gilles Debunne
fc82eeb8ef
am 949d0c8c: Merge "Text handles positions\' are correctly updated." into honeycomb-mr1
...
* commit '949d0c8c384437d92fc1432b750da6da59df1fa7':
Text handles positions' are correctly updated.
2011-03-08 10:24:30 -08:00
Gilles Debunne
13e77d6493
Merge "Text handles positions' are correctly updated." into honeycomb-mr1
2011-03-08 10:21:54 -08:00
Leon Scroggins
5c1ff3d45e
am 055a8585: Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
...
* commit '055a858562e04c903988d09973accc8aeeece02c':
Do not attempt to start action mode if there is no parent.
2011-03-08 09:10:27 -08:00
Leon Scroggins
3e41059784
Merge "Do not attempt to start action mode if there is no parent." into honeycomb-mr1
2011-03-08 09:06:54 -08:00
Simon Wilson
9f8f474da5
am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu processing." into gingerbread
...
* commit '10993b2d1e3614073970aad119ffb2cc9bc8f73f':
mms: mms wap push length check before pdu processing.
2011-03-08 07:58:20 -08:00
James Dong
eb7a2230db
am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
...
* commit 'b1be086e1d2f15c858b4aa7f40d49667b3e26d3a':
Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
2011-03-08 07:58:14 -08:00
Jesse Wilson
ee784f06fb
am 102930a0: Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
...
* commit '102930a0deaf8280a65321de0d6c120a638da9e2':
Remove deprecated and unused entryEvicted method.
2011-03-07 23:25:52 -08:00
Jesse Wilson
77818826b3
Merge "Remove deprecated and unused entryEvicted method." into honeycomb-mr1
2011-03-07 23:23:36 -08:00
Romain Guy
10955bb8f2
am bc8a8e8c: Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
...
* commit 'bc8a8e8c926115cb7b3910d016e5cff12b0f7b0a':
Add support for partial invalidates in WebView Bug #3461349
2011-03-07 22:43:02 -08:00
Romain Guy
8a2a2f4689
Merge "Add support for partial invalidates in WebView Bug #3461349 " into honeycomb-mr1
2011-03-07 22:40:27 -08:00
Mike Lockwood
be30126455
am 823f5bf3: Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
...
* commit '823f5bf3db8b2f588ae917aaff5d27a65c87f132':
MTP: Use SharedPreferences for MTP device properties rather than sqlite3
2011-03-07 20:06:37 -08:00
Mike Lockwood
da921a5e79
Merge "MTP: Use SharedPreferences for MTP device properties rather than sqlite3" into honeycomb-mr1
2011-03-07 20:04:23 -08:00
Santosh Madhava
dbb597d08b
am 0e8dc72d: Merge "Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents" into honeycomb-mr1
...
* commit '0e8dc72db34c0a4eb92763de4e048abc4d20f47f':
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
2011-03-07 19:45:25 -08:00