Nick Pelly
894a5bda4b
am d81c68c3: am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
...
* commit 'd81c68c31e916fa201f4cd608261afa4d1f0adb6':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:37:37 -08:00
Martijn Coenen
7eb32a4427
Added response flags and DSFID extras for NfcV technology (API part).
...
Also fixed a missing assignment in NfcB technology.
Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
2011-01-04 17:37:29 +11:00
Nick Pelly
d81c68c31e
am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
...
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
2011-01-03 22:35:49 -08:00
Nick Pelly
a743448a1b
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
2011-01-03 22:32:56 -08:00
Nick Pelly
ddbb2c997b
Tweak Ndef.getType() API. Rename constants, expand javadoc.
...
Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
2011-01-04 17:31:48 +11:00
Svetoslav Ganov
12bed78d23
Fixing bugs 3315632 3235958, performing a clean up of the WebView accessibility feature. Updated event hadndling to deliver all key events to javaScript if a screen reader is injected since the latter is responsible for the full set of navigation and exploration actions.
...
Change-Id: Id1639828559161e0850dee04baa0a7afb2576ea8
2011-01-03 21:30:07 -08:00
Nick Pelly
47fc50e53c
am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
...
* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e':
Added getType() to NDEF technology class (API part).
2011-01-03 21:03:06 -08:00
Nick Pelly
a3e4293cdc
am 163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
...
* commit '163bd407492bbadcdc8f0759191e1b9142d06859':
Added getType() to NDEF technology class (API part).
2011-01-03 21:01:01 -08:00
Nick Pelly
163bd40749
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
2011-01-03 20:58:26 -08:00
Martijn Coenen
d27ebf1e69
Added getType() to NDEF technology class (API part).
...
Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
2011-01-04 15:57:39 +11:00
Nick Pelly
b300ae40fc
am 30ce5f85: am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
...
* commit '30ce5f8567df2132736486bb93a60f49582508ec':
Removed selectAid() from IsoDep.
2011-01-03 20:13:17 -08:00
Nick Pelly
30ce5f8567
am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
...
* commit '8c09ef91aef0706a012e449ba3d16c03e0d64508':
Removed selectAid() from IsoDep.
2011-01-03 20:11:08 -08:00
Nick Pelly
8c09ef91ae
Merge "Removed selectAid() from IsoDep." into gingerbread
2011-01-03 20:09:03 -08:00
Martijn Coenen
912aa1cd70
Removed selectAid() from IsoDep.
...
It's a convenience method that can be implemented with transceive();
not really needed for now.
Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
2011-01-04 15:08:34 +11:00
Nick Pelly
198ec52eb7
am 7e4d74f7: am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
...
* commit '7e4d74f7b9355e8abd6e2fa30e284c9116a08998':
Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:37:05 -08:00
Nick Pelly
7e4d74f7b9
am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
...
* commit '4b94dee8336a1135e4fc67a5911223bb5aabad99':
Added transfer/restore convience cmds to MF Classic tech.
2011-01-03 18:34:37 -08:00
Martijn Coenen
a42b352594
Added transfer/restore convience cmds to MF Classic tech.
...
Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
2011-01-04 13:32:06 +11:00
Adam Powell
a5fd28f7eb
Merge "Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared container"
2011-01-03 16:56:23 -08:00
Adam Powell
654e4e4161
Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared
...
container
Change-Id: I8edb99739be43c7ee82eb4dc4b82a9be17f92d0c
2011-01-03 16:33:50 -08:00
Dianne Hackborn
83c7db8b9d
Merge "Again maybe fix issue #3169193..."
2011-01-03 15:05:29 -08:00
Amith Yamasani
7179dfd663
Merge "Fix a layout alignment issue in RingtonePickerActivity."
2011-01-03 14:08:42 -08:00
Dianne Hackborn
8b4cac1f42
Again maybe fix issue #3169193...
...
...com.google.android.youtube: java.lang.NullPointerException at
com.google.android.youtube.async.UserAuthorizer$3.onCancel(UserAuthorizer.java:324)
Only perform one cancel callback for a particular start of the dialog.
Change-Id: Ib448fcae2489a63c9b63affdc518658447e90920
2011-01-03 13:58:14 -08:00
Svetoslav Ganov
34c0688cea
Fixed the NumberPicker to adjust to the closest value while scrolling/flinging
...
Change-Id: I782603d9a187d0ce9196e3fc90f28e372637584c
2011-01-03 02:11:00 -08:00
Dianne Hackborn
7eab094722
Fix flicker issue in IME.
...
When IME is being moved as part of a window going away, it could flicker
as it immediately moves behind the window. Fix this.
Also make the default soft input mode for PopupWindow to be to not change
the IME visibility, since it is a rare pop-up window that should cause your
IME to close.
Change-Id: I0b43e080ad012739e9a3e5842794c778c859ac1a
2011-01-01 13:32:30 -08:00
Svetoslav Ganov
25f84f323c
3316147 TimePicker and DatePicker is editable even after the first setEnabled(false).
...
Change-Id: If800b048973200d249b1f5c62af064392ed98d91
2010-12-29 22:39:54 -08:00
Amith Yamasani
303f38c4d3
Merge "Use proper divider asset and margins."
2010-12-29 14:28:39 -08:00
Amith Yamasani
d1d7e97a9c
Use proper divider asset and margins.
...
Bug: 3191953
2010-12-29 14:16:55 -08:00
Jeff Brown
8235404786
Merge "Add initial support for cursor-based pointing devices."
2010-12-29 13:22:08 -08:00
Jeff Brown
83c09685f2
Add initial support for cursor-based pointing devices.
...
Some parts stubbed out but you can plug in a mouse and move
a green cursor around to interact with the UI.
Change-Id: I80d597a7f11d3bd92041890f74b3c77326975e6e
2010-12-29 13:19:53 -08:00
Cary Clark
688432f640
Merge "defer accelerator keys to hosting application"
2010-12-29 12:01:09 -08:00
Mike Lockwood
d07c9d5d92
UsbManager: Add methods to convert between USB device names and IDs
...
Change-Id: I199a47805b629cc7b1714191d6af2fd70c2bda6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:44:54 -05:00
Hung-ying Tyan
f268a527a2
Add config flag for enabling SIP/phone integration.
...
Bug: 3304625
Change-Id: If08755a1859978024569f71aee3614178a801122
2010-12-29 17:53:36 +08:00
Jean-Baptiste Queru
4887804ea6
am a6ac0ec3: am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
...
* commit 'a6ac0ec30dfdacb7baba126b5cea69fc7097496e':
according to rfc2617, nc-value = 8LHEX
2010-12-28 15:53:41 -08:00
Jean-Baptiste Queru
a6ac0ec30d
am 69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
...
* commit '69ebb984f230a523dc316bdb2c9e9c28111364fd':
according to rfc2617, nc-value = 8LHEX
2010-12-28 15:47:42 -08:00
Jean-Baptiste Queru
69ebb984f2
Merge "according to rfc2617, nc-value = 8LHEX"
2010-12-28 15:33:10 -08:00
Amith Yamasani
fe7630e648
Fix a layout alignment issue in RingtonePickerActivity.
...
Bug: 3307324
2010-12-28 15:27:46 -08:00
Svetoslav Ganov
e51f94cfe9
Updating the ColandarView javadoc to reflect public attributes
...
Change-Id: I6cea3af0c310ef8478e7ff9de23e5c40a7063c02
2010-12-28 15:21:43 -08:00
Svetoslav Ganov
3d99f5b6ef
Merge "3313982 DatePicker/TimePicker allow users to scroll date/time even when disabled."
2010-12-28 15:06:34 -08:00
Svetoslav Ganov
51c52edad7
3313982 DatePicker/TimePicker allow users to scroll date/time even when disabled.
...
Change-Id: I8c28615bfc813dfdddf21c40d84cc7c36f1fd391
2010-12-28 15:05:43 -08:00
Alon Albert
2967aa3e60
am 672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
...
* commit '672ebb61a755e4bbe60e4e884b1adadf186733b6':
Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
2010-12-28 14:57:09 -08:00
Chet Haase
e646b28cb3
Minor fix to previous fragment change: non-animating case
...
The previous change only hid the fragment when the transition animation
ended. But if there is no animation, the fragment would never be hidden.
This change adds an else clause that handles the non-animating case.
Change-Id: Ie35b2ae98cb5c21193dadefbef71b8542fcf5f7d
2010-12-28 14:48:32 -08:00
Alon Albert
672ebb61a7
Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
2010-12-28 14:44:51 -08:00
Chet Haase
61eb40d276
Delay hiding fragments until transition finishes
...
Change-Id: I616de20e7e161fe1a53cd5e72912cec48f078df5
2010-12-28 14:25:56 -08:00
Dianne Hackborn
1b39e221e2
Fix NPE pointed out by Chet.
...
Change-Id: Id421476aa6f6ff281054b435ecd09f932966305c
2010-12-28 14:17:18 -08:00
Dianne Hackborn
d173fa3b1c
Possible fix to issue #3213749 : NPE at...
...
...android.app.Fragment.startActivityForResult(Fragment.java)
Make sure to remove all pending messages when AbsListView is detached
from its window.
But... that's not enough.
It turns out that when a fragment's views are animating away, they of
course don't get detached until after the animation is done. However
the fragment itself is immediately destroyed, leaving its live views
still going after that.
Here's a possible solution: when fragment manager initiates an animation
on a fragment whose views are being removed, it makes note of that so
it can hold off on destroying the fragment until the animation is over.
There are a lot of interesting race conditions here, if further operations
happen on the fragment while it is being animated. I think the code here
does something sensible, and it does seem to work for the situations I
have tested, but it is hard to know all of the edge cases that may happen.
Change-Id: I4490ce8862a9bb714c7ea54baca3072c62126388
2010-12-28 14:01:20 -08:00
Cary Clark
122da932e0
defer accelerator keys to hosting application
...
Allow the hosting application to do what they want if the
control key is pressed. In particular, let our Browser
map Ctrl-arrow to back and forward.
bug:3270434
Change-Id: I2dfa648edbf5a0e48b674df5023182b4a70985f6
2010-12-28 16:11:35 -05:00
Svetoslav Ganov
7d4b0062f8
Merge "Adding APIs for setting whether to show week number and setting the start day of week. Cleaned up the code a bit."
2010-12-28 12:44:54 -08:00
Robert Greenwalt
55985bed7b
Make sure the ProxyProperties is always present.
...
Lets people know that it's non-null, though the InetAddr inside may be.
bug:3305689
Change-Id: I0fe16a9ef1feba987680c419fa2dc0e00e400d91
2010-12-28 11:15:06 -08:00
Jean-Baptiste Queru
03ee779b28
am e90a1b16: am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
...
* commit 'e90a1b16a3d6c559cb7fc47ad967a1810d88e923':
The phone is crashing when unknown mime content is transferred.
2010-12-28 11:00:39 -08:00
Jean-Baptiste Queru
e90a1b16a3
am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
...
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
The phone is crashing when unknown mime content is transferred.
2010-12-28 10:55:04 -08:00