Michael Kolb
dce574a191
am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
add comment to deprecated tag
2011-03-16 13:43:30 -07:00
Michael Kolb
5b7a1bd790
am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1
...
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
add comment to deprecated tag
2011-03-16 13:38:24 -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
0677d2526d
am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
deprecate getVisibleTitleHeight
2011-03-16 12:35:42 -07:00
Jeff Brown
5949f89f3c
Merge "Add 3D mode key and others."
2011-03-16 11:46:00 -07:00
Michael Kolb
d799caa9a6
am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1
...
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
deprecate getVisibleTitleHeight
2011-03-16 11:37:23 -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
Jeff Brown
9812aed276
Add 3D mode key and others.
...
Related to an AOSP change request.
Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
2011-03-16 11:31:42 -07:00
Svetoslav Ganov
4ad45c4d15
Merge "Pressed state not cleared if view is disabled in long click handler"
2011-03-16 11:13:41 -07:00
Kenny Root
63fce8c56d
Merge "Update WakeLock-related docs to mention permissions"
2011-03-16 10:05:23 -07:00
Kenny Root
d710fb500c
Update WakeLock-related docs to mention permissions
...
android.permission.WAKE_LOCK permission is required to use WakeLock or
WifiLock, but nowhere is it mentioned that you must declare that
permission to use it.
Change-Id: Ib5f5294d37e39169fe5678743f380d95c4e5a842
2011-03-16 09:38:11 -07:00
Michael Kolb
e54f66524e
deprecate getVisibleTitleHeight
...
Bug: 4104535
Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
2011-03-16 09:25:23 -07:00
Wei Huang
55685a6965
Merge "Add the field date_sent to keep track of the date a message was sent."
2011-03-16 08:36:14 -07:00
Wu-cheng Li
3ffc993590
Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc."
2011-03-16 03:08:34 -07:00
Wu-cheng Li
e7bc746e67
Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc.
...
Change-Id: Ib0b637ad69a559a328ac812d710b4990fd8b1a87
2011-03-16 17:42:49 +08:00
satok
35267f178c
Merge "Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView"
2011-03-15 23:13:56 -07:00
satok
adb435835f
Add CorrectionSpan and APIs to pass a secure CorrectionSpan to TextView
...
- CorrectionSpan is a span which has suggestions made by IME.
This has a function to change the current IME to other IME specified
in this span. For security reasons, only the current IME
is allowed to use this function through InputConnection.
(IME token is used for checking the validity of it.).
- CorrectionSpan stores following information:
flags, subtype Id, InputMethodInfo Id, suggests, locale, original string
Change-Id: Id3abc9ea4d11753cdc4f483a2bb3128f49ba198a
2011-03-16 14:44:37 +09:00
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
Jeff Brown
843e29d375
Merge "Improve VelocityTracker numerical stability."
2011-03-15 20:01:16 -07:00
Jeff Brown
2ed2462aa2
Improve VelocityTracker numerical stability.
...
Replaced VelocityTracker with a faster and more accurate
native implementation. This avoids the duplicate maintenance
overhead of having two implementations.
The new algorithm requires that the sample duration be at least
10ms in order to contribute to the velocity calculation. This
ensures that the velocity is not severely overestimated when
samples arrive in bursts.
The new algorithm computes the exponentially weighted moving
average using weights based on the relative duration of successive
sample periods.
The new algorithm is also more careful about how it handles
individual pointers going down or up and their effects on the
collected movement traces. The intent is to preserve the last
known velocity of pointers as they go up while also ensuring
that other motion samples do not count twice in that case.
Bug: 4086785
Change-Id: I2632321232c64d6b8faacdb929e33f60e64dcdd3
2011-03-15 19:59:47 -07:00
Dianne Hackborn
437c2c1620
Merge "Add new PreferenceActivity API for settings."
2011-03-15 16:52:40 -07:00
Dianne Hackborn
b1a6e439f6
Add new PreferenceActivity API for settings.
...
Need to redirect to a different activity when on non-xlarge screens.
Change-Id: I8cf4793b117325604d29ecc4478dbf10322a4689
2011-03-15 16:23:01 -07:00
Dianne Hackborn
fd865d0fb5
am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
Improve error reporting for issue #3183612
2011-03-15 15:47:32 -07:00
Dianne Hackborn
9b7c1274dd
am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Dianne Hackborn
e2e8da7c73
am 7c2e76f0: Merge "Improve error reporting for issue #3183612 " into gingerbread
...
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09
am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
...
* commit 'b09763209980ff9210cc353f2410598220ec0480':
DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 14:49:37 -07:00
Dianne Hackborn
7c2e76f0a4
Merge "Improve error reporting for issue #3183612 " into gingerbread
2011-03-15 14:40:56 -07:00
Dianne Hackborn
1ab43775d8
Improve error reporting for issue #3183612
...
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.
Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Mike Lockwood
638d7cb3ee
DO NOT MERGE: Backport more USB accessory changes from honeycomb
...
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04: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
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
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
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
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
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
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
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
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
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
Svetoslav Ganov
9406eb13d5
am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:17:58 -07:00
Svetoslav Ganov
6d4f318f0c
am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
...
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
Tapping on the week number sends the DatePicker to epoch start.
2011-03-14 23:15:24 -07:00
Svetoslav Ganov
e65711b21f
Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1
2011-03-14 23:13:49 -07:00