Svetoslav Ganov
77b80c06af
Pressed state not cleared if view is disabled in long click handler
...
bug:2133127
If a View is disabled its onTouchEvent handler uses a shortcut
path for efficient handling which does not clear the pressed
flag. As a result if the view is disabled in a long click
handler the view keeps being in pressed state. The fix is to
clear if needed the pressed flag in the shortcut path
of onTouchEvent.
Change-Id: I046a62c2fce751c27fec3cfb756b74431fc003c3
2011-03-15 20:53:10 -07:00
Gloria Wang
0e5e2e2b2b
Merge "Bug fixes of DRM framework."
2011-03-15 14:10:30 -07:00
Kenny Root
d4a9bb569e
am b3150784: (-s ours) am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit 'b3150784487e7578a004c14da5c00d9bc6eb2fc9':
Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:09:54 -07:00
Kenny Root
b315078448
am 7ddd62b5: (-s ours) Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
...
* commit '7ddd62b5bedf9065bba00e25aa62f2eae14cf92e':
Add byte limit in addition to ratio for installs DO NOT MERGE
2011-03-15 14:03:50 -07:00
Kenny Root
7ddd62b5be
Merge "Add byte limit in addition to ratio for installs DO NOT MERGE" into honeycomb-mr1
2011-03-15 14:01:39 -07:00
Glenn Kasten
e5eb43b5d9
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
...
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
2011-03-15 13:51:17 -07:00
Mike Lockwood
7896f1bd55
am c9b82ebb: am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit 'c9b82ebb97411cf4a8494dc83f57039bb77937c5':
USB Manager string clean up:
2011-03-15 13:49:14 -07:00
Svetoslav Ganov
e822af2f7b
am 3b901c4b: am bdabdda8: Merge "CheckBoxPreferences do not fire accessibility events" into honeycomb-mr1
...
* commit '3b901c4b89b2f42c4a212d3f176272f911386e64':
CheckBoxPreferences do not fire accessibility events
2011-03-15 13:49:12 -07:00
Mike Lockwood
aa155b4bee
am 6a20784e: am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1
...
* commit '6a20784e461b0c0b24ccd04acf9509565aec3e70':
SqliteDatabase: Fix local reference leak in custom_function_callback()
2011-03-15 13:49:09 -07:00
Glenn Kasten
7d7dcb5ea8
am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
...
* commit '4528a7db389b4da73207d00ca15b306a111650cc':
Bug 4016329 do full string comparisons
2011-03-15 13:46:27 -07:00
Glenn Kasten
4528a7db38
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
2011-03-15 13:44:58 -07:00
Mike Lockwood
c9b82ebb97
am 3b7871c2: Merge "USB Manager string clean up:" into honeycomb-mr1
...
* commit '3b7871c242bea5834c657c25fbb89c382566f66f':
USB Manager string clean up:
2011-03-15 13:42:44 -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
Mike Lockwood
3b7871c242
Merge "USB Manager string clean up:" into honeycomb-mr1
2011-03-15 13:34:06 -07:00
Mike Lockwood
ad5f83e91b
USB Manager string clean up:
...
- Use "Cancel" instead of "Ignore"
- Customize the text for the "always use" checkbox for devices and accessories
- Clean up strings for AccessoryChat test program
Bug: 4074719
Change-Id: Ideec838e4c1f1a82ef4ae411c9124417ffb63165
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:23:40 -04: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
e196481d59
am fbe9ca72: am 1d233d97: Merge "Fix bug 4088936 - Tabs in the action bar don\'t seem to have a fading edge" into honeycomb-mr1
...
* commit 'fbe9ca72625e9789f334e96b731a6ce0e4153ada':
Fix bug 4088936 - Tabs in the action bar don't seem to have a fading edge
2011-03-15 13:01:32 -07:00
Stephen Hines
cc0773bd02
am ae2f3b3a: am c2db0d40: Merge "Make RS Matrix functions threadable." into honeycomb-mr1
...
* commit 'ae2f3b3a4629629914e6ad5d410594c7dbc856ee':
Make RS Matrix functions threadable.
2011-03-15 13:01:30 -07:00
Jamie Gennis
e218208f6a
am 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1
...
* commit '0ea44ac0deb5cc95d60dd512c3a8f6a1bb69f5d1':
SurfaceTexture: disallow unsupported uses.
2011-03-15 13:01:27 -07:00
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