Eric Fischer
c657fcce45
am 20ccaf6c: Import revised translations. DO NOT MERGE
...
* commit '20ccaf6cc1a79a3f7973e5875c66e2bce2ebee7c':
Import revised translations. DO NOT MERGE
2011-03-16 17:10:09 -07:00
Eric Fischer
20ccaf6cc1
Import revised translations. DO NOT MERGE
...
Change-Id: I59b21268d693f0fac87e787fceb4f41b3f3e6acd
2011-03-16 16:48:09 -07:00
Shimeng (Simon) Wang
f2532d16a4
am 464b690a: Pass firstLayout info to native webview when setting baseLayer.
...
* commit '464b690ada24428f3dff4102659048db7128835f':
Pass firstLayout info to native webview when setting baseLayer.
2011-03-16 14:47:32 -07:00
Shimeng (Simon) Wang
464b690ada
Pass firstLayout info to native webview when setting baseLayer.
...
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
2011-03-16 13:56:37 -07:00
Michael Kolb
b0a07f0ce5
am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
add comment to deprecated tag
2011-03-16 13:34:30 -07:00
Michael Kolb
24e53b00b0
add comment to deprecated tag
...
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
2011-03-16 12:56:39 -07:00
Michael Kolb
9a0df3c5c7
am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
deprecate getVisibleTitleHeight
2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c
Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
2011-03-16 11:33:13 -07:00
Eric Fischer
d5eb3bbbf2
am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
Import revised translations. DO NOT MERGE
2011-03-16 10:51:56 -07:00
Eric Fischer
cc571e9643
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247
Import revised translations. DO NOT MERGE
...
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
2011-03-16 10:11:58 -07:00
Michael Kolb
e54f66524e
deprecate getVisibleTitleHeight
...
Bug: 4104535
Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
Justin Ho
6ad9cc9afd
am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
...
* commit '6764ecf8630af4c6260007e688cea0056ecf4ec7':
Integrating new ADB USB debugging asset Bug: #6699FF
2011-03-15 23:44:12 -07:00
Justin Ho
750a4a2623
am 141505a9: Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
...
* commit '141505a9769099ac38eacb62409a75ff891860a1':
Fix expander list group indicator Bug: #6699FF
2011-03-15 23:44:08 -07:00
Eric Fischer
a78327da45
am acca1600: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
...
* commit 'acca16004fd58c2b8c489f031281b58551551dc8':
Import revised translations. DO NOT MERGE
2011-03-15 23:29:10 -07:00
Justin Ho
6764ecf863
Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:52:07 -07:00
Justin Ho
141505a976
Merge "Fix expander list group indicator Bug: #6699FF" into honeycomb-mr1
2011-03-15 16:47:27 -07:00
Justin Ho
75fe135e62
Integrating new ADB USB debugging asset
...
Bug: #6699FF
Change-Id: Iab8debef59178d56ea78883a5737b7614649f948
2011-03-15 16:40:36 -07:00
Justin Ho
a5c064e0d9
Fix expander list group indicator
...
Bug: #6699FF
Change-Id: I48f2ecb2246ad5d5e11d7e9122b6ef90c764b571
2011-03-15 16:38:58 -07:00
Eric Fischer
acca16004f
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:59:33 -07:00
Eric Fischer
4670b4d95c
Import revised translations. DO NOT MERGE
...
Change-Id: Ief48781413cadb2a9bd786974e4688ac222d7b36
2011-03-15 14:40:53 -07:00
Svetoslav Ganov
3b901c4b89
am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
...
* commit 'bdabdda8954a70625368fbfe6bb283a9200bf2f8':
CheckBoxPreferences do not fire accessibility events
2011-03-15 13:42:38 -07:00
Mike Lockwood
6a20784e46
am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
...
* commit 'afd1c0143dfa63bd133e3a4163cc9cc4216e3514':
SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:42:35 -07:00
Svetoslav Ganov
bdabdda895
Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
2011-03-15 13:23:17 -07:00
Mike Lockwood
afd1c0143d
Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
2011-03-15 13:20:58 -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
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
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
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
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
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
b8796212e3
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
...
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
2011-03-15 11:54:46 -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
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
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
Brad Fitzpatrick
ceae99835e
am 9a01a2f2: Merge "Fixing self-assignment in cloning code."
...
* commit '9a01a2f2720632aa9cc230a4ebb0ed7aee762eec':
Fixing self-assignment in cloning code.
2011-03-15 11:33:40 -07:00
Brad Fitzpatrick
33dd1bae6e
am 29d75c9a: Merge "Fixing improper boxing to Integer instead of Long."
...
* commit '29d75c9a10a1ff6d60e85a1931d042d3e24d9549':
Fixing improper boxing to Integer instead of Long.
2011-03-15 11:30:08 -07:00
Brad Fitzpatrick
cd7dfcec4b
am 40b207c1: Merge "Using proper key for removing object from the map."
...
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
Using proper key for removing object from the map.
2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2
am b37f7e59: Merge changes I81fc2f90,I5e7fd759
...
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 11:29:56 -07:00
Brad Fitzpatrick
8d25eab105
Merge "Releasing lock even if exception is thrown."
2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
8b5345fb36
Merge "Fixing self-assignment in copying code."
2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272
Merge "Fixing self-assignment in cloning code."
2011-03-15 11:15:19 -07:00
Dianne Hackborn
f58f041beb
am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
Add some debug code to try to track down issue 3183612
2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
29d75c9a10
Merge "Fixing improper boxing to Integer instead of Long."
2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131
Merge "Using proper key for removing object from the map."
2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee
Merge changes I81fc2f90,I5e7fd759
...
* changes:
Using proper key for removing from map.
Removing wrong equals method in comparator.
2011-03-15 10:56:16 -07:00
Dianne Hackborn
cffde30fc1
am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread
...
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
Add some debug code to try to track down issue 3183612
2011-03-15 10:52:27 -07:00
Amith Yamasani
7e978441ee
Merge "Use more padding on the sides for SearchView" into honeycomb-mr1
2011-03-15 10:47:01 -07:00
Dianne Hackborn
44220a5602
Merge "Add some debug code to try to track down issue 3183612" into gingerbread
2011-03-15 10:29:04 -07:00