Romain Guy
8390c7cf68
am 5c84a134: am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
...
* commit '5c84a1341b05e96f2c76da7252ed823ec3121102':
Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
2011-03-15 13:01:24 -07:00
Scott Main
a91c019ce1
am d0217844: am 197d7752: am e8f95e7f: docs: update device dashboard
...
* commit 'd0217844320aa5ce620d7fa9e994d78d378006ae':
docs: update device dashboard
2011-03-15 13:01:20 -07:00
Amith Yamasani
68feabc4e3
am 4a04f11b: am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
...
* commit '4a04f11b437d7d92d580c7c8b0b4b54876b6a934':
Use more padding on the sides for SearchView
2011-03-15 13:01:17 -07:00
Adam Powell
fbe9ca7262
am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit '1d233d9708e39f5b57b231746df658567b153484':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 12:51:07 -07:00
Stephen Hines
ae2f3b3a46
am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
...
* commit 'c2db0d405b7d4b7654dbd3740cc065802e4c294e':
Make RS Matrix functions threadable.
2011-03-15 12:50:57 -07:00
Jamie Gennis
0ea44ac0de
am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
...
* commit '00f47af85a98c6dc3b20d04d8ee6b9a327175ab6':
SurfaceTexture: disallow unsupported uses.
2011-03-15 12:50:55 -07:00
Romain Guy
5c84a1341b
am a1bd5a5f: Merge "Fix disappearing edges in lists/scrollviews/etc. Bug #4093871 " into honeycomb-mr1
...
* commit 'a1bd5a5fd7107483290627d942ae2dd1910b57ca':
Fix disappearing edges in lists/scrollviews/etc. Bug #4093871
2011-03-15 12:50:50 -07:00
Scott Main
d021784432
am 197d7752: am e8f95e7f: docs: update device dashboard
...
* commit '197d77528648b7ec3d44ca6ab63e3036669c1bc8':
docs: update device dashboard
2011-03-15 12:50:47 -07:00
Amith Yamasani
4a04f11b43
am 7e978441: Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
...
* commit '7e978441eeed9defb1031cc17c2857cf06cf825a':
Use more padding on the sides for SearchView
2011-03-15 12:50:35 -07:00
Kenny Root
1aa73a1bba
Add byte limit in addition to ratio for installs DO NOT MERGE
...
Previously you were not allowed to install anything to the internal
storage if there was less than 10% free space available on the
internal storage. This doesn't make sense on devices with huge storage
capacity, so just add in a hard-coded byte limit.
This will be cleaned up at a later time to use the same code as
DeviceStorageMonitorService to determine the limits.
Bug: 4086510
Change-Id: I39f69b5272ef44fea218e3b45171b48e2eab2480
2011-03-15 12:43:07 -07:00
Svetoslav Ganov
1686e9afd4
CheckBoxPreferences do not fire accessibility events
...
bug:4091160
We no longer allow not shown views to fire accessibility
events. Therefore, CheckBoxPreference can no longer ask its
associated checkbox to fire an accessibility event because
the latter is not attached to the view hierarchy
(i.e. not shown) by the time the CheckBoxPreference has a
chance to send an accessibility event. Instead the
CheckBoxPreference itself is responsible for firing the event.
Change-Id: Ia742882b13bf6c441cc76fa1e84b47a55cee601c
2011-03-15 12:30:20 -07:00
Xavier Ducrohet
4bcce972cd
am 9b50c1fc: (-s ours) am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
...
* commit '9b50c1fcda99fd74fe40b6393d57f9dacc8c7d12':
Merge 9d76581f from honeycomb. do not merge.
2011-03-15 12:07:43 -07:00
Xavier Ducrohet
7912c457f0
am 20ad9553: (-s ours) am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.
...
* commit '20ad95532476bad17bbef8d406814b06f3d7fcf1':
Merge adaa12cd from honeycomb. do not merge.
2011-03-15 12:07:41 -07:00
Brad Fitzpatrick
29d5873931
am aaae0573: am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit 'aaae0573bb537b9de89c0410b9386e8f96c3568b':
Releasing lock even if exception is thrown.
2011-03-15 12:07:36 -07:00
Brad Fitzpatrick
5e72152a4c
am b8c5fe00: am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
...
* commit 'b8c5fe004dce258eeca5fbba1925b9b1f513d650':
Lazy initialization must be synchronized to avoid parallel instances cretation.
2011-03-15 12:07:33 -07:00
Brad Fitzpatrick
535482b90a
am 36ca1d3a: am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."
...
* commit '36ca1d3a693f0a416e758bb52801a3381a34a605':
Removing self-assignment statement.
2011-03-15 12:07:30 -07:00
Brad Fitzpatrick
3006f63d5f
am b41c37ee: am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code."
...
* commit 'b41c37eec16d030563829108d8c77a9c14931991':
Fixing self-assignment in copying code.
2011-03-15 12:07:27 -07:00
Adam Powell
1d233d9708
Merge "Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge" into honeycomb-mr1
2011-03-15 12:06:45 -07:00
Xavier Ducrohet
9b50c1fcda
am b7b877a4: (-s ours) am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
...
* commit 'b7b877a45f469336703844a928482e6438442567':
Merge 9d76581f from honeycomb. do not merge.
2011-03-15 12:05:46 -07:00
Xavier Ducrohet
20ad955324
am a82a219a: (-s ours) am b243aabd: Merge adaa12cd from honeycomb. do not merge.
...
* commit 'a82a219a7aaee82d790810f6660924604b7a7e81':
Merge adaa12cd from honeycomb. do not merge.
2011-03-15 12:05:43 -07:00
Brad Fitzpatrick
aaae0573bb
am 403da3a7: am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '403da3a79af78920b33448bbc8d91c4b8aebf4a4':
Releasing lock even if exception is thrown.
2011-03-15 12:05:40 -07:00
Brad Fitzpatrick
b8c5fe004d
am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
...
* commit 'a74887e87c720fd100f10b2e69a027c493036e20':
Lazy initialization must be synchronized to avoid parallel instances cretation.
2011-03-15 12:05:37 -07:00
Brad Fitzpatrick
36ca1d3a69
am 9ac9b285: am b98c8fca: Merge "Removing self-assignment statement."
...
* commit '9ac9b28576834b69561a48a4050e7ad027543bcd':
Removing self-assignment statement.
2011-03-15 12:05:33 -07:00
Brad Fitzpatrick
b41c37eec1
am b01fc9fb: (-s ours) am 8b5345fb: Merge "Fixing self-assignment in copying code."
...
* commit 'b01fc9fb450df941ae7c072247b67c9be32cd8b8':
Fixing self-assignment in copying code.
2011-03-15 12:05:29 -07:00
Xavier Ducrohet
3bc74967ea
am e8a00ad2: (-s ours) am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
...
* commit 'e8a00ad288e36204cab2ba2407b42525fe2e44e0':
Merge 6f2fb570 from honeycomb. do not merge.
2011-03-15 12:01:26 -07:00
Xavier Ducrohet
fff6a88ccc
am 9cb1acda: (-s ours) am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
...
* commit '9cb1acda89919a46583444f788f4808fecd5d78d':
Merge c12b4093 from honeycomb. do not merge.
2011-03-15 12:01:24 -07:00
Eric Fischer
b2389eaada
Merge "Import revised translations."
2011-03-15 12:00:49 -07:00
Adam Powell
c18c38f36e
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
...
Change-Id: I23c736ad458c721dfa86563f66b42dd5d6ca708e
2011-03-15 11:57:46 -07:00
Brad Fitzpatrick
3a5bfa7b4f
am b8796212: resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
...
* commit 'b8796212e3544262193960ade01db6cb2023c8f9':
Fixing self-assignment in cloning code.
2011-03-15 11:57:44 -07:00
Xavier Ducrohet
e8a00ad288
am f89c3729: (-s ours) am 48a2a5ad: Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread
...
* commit 'f89c37295db5df34c014e0791c976cfa94509068':
Merge 6f2fb570 from honeycomb. do not merge.
2011-03-15 11:57:35 -07:00
Xavier Ducrohet
9cb1acda89
am 405cb570: (-s ours) am 14e1f523: Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread
...
* commit '405cb57019e0b0b9c2049c2b06537c0f4981fc37':
Merge c12b4093 from honeycomb. do not merge.
2011-03-15 11:57:30 -07:00
Brad Fitzpatrick
b8796212e3
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
...
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
2011-03-15 11:54:46 -07:00
Stephen Hines
c2db0d405b
Merge "Make RS Matrix functions threadable." into honeycomb-mr1
2011-03-15 11:52:36 -07:00
Brad Fitzpatrick
525175c28e
am d927e274: am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit 'd927e2742871dec1cf9a8d861a24d5bcc73c542e':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:44:48 -07:00
Brad Fitzpatrick
d9284580c6
am 6f80f395: am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit '6f80f395b71cb641b77097e14a1906c7842c9ba6':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:44:46 -07:00
Brad Fitzpatrick
7fa77d8b23
am b81d7f83: am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit 'b81d7f833890498b6d5db9c16f32564cc88a4042':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:44:43 -07:00
Brad Fitzpatrick
57e680f74d
am 8ea79313: am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map."
...
* commit '8ea7931357956a5eb03fd5e0cb9cc781e75a471e':
Using proper key for removing object from the map.
2011-03-15 11:44:40 -07:00
Brad Fitzpatrick
d927e27428
am b7d573e9: am 7972e382: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit 'b7d573e901e07fc249df0bc531cf94c574107556':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:43:08 -07:00
Brad Fitzpatrick
6f80f395b7
am c86ea5e2: am 38c6e31c: Merge "Removing repetitive conditional; it simply does nothing except slowing down things."
...
* commit 'c86ea5e260a70f7c48890da702f86466d587904e':
Removing repetitive conditional; it simply does nothing except slowing down things.
2011-03-15 11:43:03 -07:00
Brad Fitzpatrick
b81d7f8338
am 33dd1bae: am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '33dd1bae6ef16ed1cdc4d9f82f0c608cc7601af6':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:42:58 -07:00
Brad Fitzpatrick
8ea7931357
am cd7dfcec: (-s ours) am 40b207c1: Merge "Using proper key for removing object from the map."
...
* commit 'cd7dfcec4b9a059cd67783c8abed72f74c03c4b0':
Using proper key for removing object from the map.
2011-03-15 11:42:53 -07:00
Xavier Ducrohet
b7b877a45f
am 0a98226e: Merge 9d76581f from honeycomb. do not merge.
...
* commit '0a98226e3c8cda46786558147a0eb6a56c3370c0':
Merge 9d76581f from honeycomb. do not merge.
2011-03-15 11:41:13 -07:00
Xavier Ducrohet
a82a219a7a
am b243aabd: Merge adaa12cd from honeycomb. do not merge.
...
* commit 'b243aabdaf1ba6fdfc0579c9f949e00d562456ed':
Merge adaa12cd from honeycomb. do not merge.
2011-03-15 11:41:10 -07:00
Brad Fitzpatrick
69edd9d51b
am 64ac744b: am c73c4a36: (-s ours) am b37f7e59: Merge changes I81fc2f90,I5e7fd759
...
* commit '64ac744b9fc63be54d8f29b624b657c4b28b3ee1':
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 11:39:42 -07:00
Jamie Gennis
00f47af85a
Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
2011-03-15 11:39:24 -07:00
Mike Lockwood
b0f72de87d
SqliteDatabase: Fix local reference leak in custom_function_callback()
...
Caused a local reference table overflow, only when deleting a large number
of files in a single SQL transaction in the media provider.
Bug: 4093346
Change-Id: I10078a5d7537c2e577763d88e909e34321945a59
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 14:38:28 -04:00
Brad Fitzpatrick
403da3a79a
am 8d25eab1: Merge "Releasing lock even if exception is thrown."
...
* commit '8d25eab10523ac2424dc645dc697126dbadad588':
Releasing lock even if exception is thrown.
2011-03-15 11:37:37 -07:00
Brad Fitzpatrick
a74887e87c
am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."
...
* commit '56c4c442c0309aa91958dee6b6ed2d65db7ba17d':
Lazy initialization must be synchronized to avoid parallel instances cretation.
2011-03-15 11:37:32 -07:00
Brad Fitzpatrick
9ac9b28576
am b98c8fca: Merge "Removing self-assignment statement."
...
* commit 'b98c8fca954718cb61d6513e623a78f1b0bd0edb':
Removing self-assignment statement.
2011-03-15 11:37:29 -07:00
Brad Fitzpatrick
b01fc9fb45
am 8b5345fb: Merge "Fixing self-assignment in copying code."
...
* commit '8b5345fb3647fee0ec5882537b6a68bb90f4ac1b':
Fixing self-assignment in copying code.
2011-03-15 11:37:25 -07:00