Romain Guy
527c20595b
am 3957a76d: Merge "ToggleButton could keep a reference to a previous drawable"
...
* commit '3957a76d7738ff6fd75bfeb41b04511eec79d488':
ToggleButton could keep a reference to a previous drawable
2011-08-26 19:31:59 -07:00
Romain Guy
3957a76d77
Merge "ToggleButton could keep a reference to a previous drawable"
2011-08-26 19:30:08 -07:00
Nick Pelly
cc5477a92a
am e432de84: Merge "Improve NDEF push API"
...
* commit 'e432de8493bae1f6017731d6668a0fada334aa8d':
Improve NDEF push API
2011-08-26 17:33:05 -07:00
Nick Pelly
e432de8493
Merge "Improve NDEF push API"
2011-08-26 17:31:02 -07:00
Nick Pelly
c84c89a6ca
Improve NDEF push API
...
Introduce
setNdefPushMessage()
setNdefPushMessageCallback()
setNdefPushCompleteCallback()
Deprecate public API
enableForegroundNdefPush()
disableForegroundNdefPush()
Hide & Deprecate staged (public but never released) API
enableForegroundNdefPushCallback()
The new API's do not require the application to explicitly call
enable()/disable() in onPause()/onResume(), we use a Fragment behind
the scenes to manager this automatically.
NDEF Push can be disabled by using a null parameter, so each
enable()/disable() pair is collapsed to a single set() call.
Application code should now look something like:
public void onCreate() {
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(this);
if (adapter != null) { // check that NFC is available on this device
adapter.setNdefPushMessage(myNdefMessage, this);
}
}
And that's it - no need to explicitly hook into onPause() and onResume() events.
Also - introduce a generic NfcEvent class that is provided as a parameter on
all NFC callbacks. Right now it just provides the NfcAdapter, but using
the wrapper classes allows us to add more fields later without changing
the callback signature. (i'm thinking Bluetooth).
Change-Id: I371dcb026b535b8199225c1262eca64ce644458a
2011-08-26 17:28:45 -07:00
Martijn Coenen
2df496388b
am 6a85a488: Merge "Add getMaxTransceiveLength() API."
...
* commit '6a85a48831a1a78e378aeaf8bd080f3610b1ea40':
Add getMaxTransceiveLength() API.
2011-08-26 16:38:03 -07:00
Martijn Coenen
6a85a48831
Merge "Add getMaxTransceiveLength() API."
2011-08-26 16:36:29 -07:00
Martijn Coenen
faca12adc6
Add getMaxTransceiveLength() API.
...
Also moved canMakeReadOnly() down in the stack, and
cleaned up TransceiveResult.
Change-Id: I85576c52478ab79f0726606659b0c17d00b222e6
2011-08-26 16:30:58 -07:00
Chet Haase
e428aa6270
am 4c340652: Merge "Fixed error in invalidation/LayoutTransition logic"
...
* commit '4c340652f8d83961f3d9a3b7ce519efc98a275b4':
Fixed error in invalidation/LayoutTransition logic
2011-08-26 16:28:22 -07:00
Romain Guy
aa1c88de02
ToggleButton could keep a reference to a previous drawable
...
Change-Id: Ic19a8e86c61b58926504daf35f0de41358a899b4
2011-08-26 16:21:03 -07:00
Chet Haase
aceafe63ee
Fixed error in invalidation/LayoutTransition logic
...
A recent fix for invalidation noop'd calls to invalidate() on
GONE/INVISIBLE views. This logic also noop'd views which might
be GONE, but which are in the process of fading in/out via
LayoutTransition animations. These views should invalidate as
usual.
Change-Id: Ie90a340f70290391a3aa4e68df535c6aabf4e5eb
2011-08-26 16:05:29 -07:00
Jeff Sharkey
f01f4522cb
am e598cd01: Merge "Always splice historical data stats, debug info."
...
* commit 'e598cd0143c0c79b0f6c6f557269ed5f5100e78b':
Always splice historical data stats, debug info.
2011-08-26 15:47:28 -07:00
Jeff Sharkey
e598cd0143
Merge "Always splice historical data stats, debug info."
2011-08-26 15:46:19 -07:00
John Reck
0f593f1fd4
am 2c5423da: Merge "Better touch rects"
...
* commit '2c5423da4e3b23c0381952da2671f05a7501f9af':
Better touch rects
2011-08-26 15:33:35 -07:00
John Reck
2c5423da4e
Merge "Better touch rects"
2011-08-26 15:31:16 -07:00
John Reck
335f454753
Better touch rects
...
Bug: 5164486
Get the focus rings from webkit instead of the navcache
and draw them in Java.
Change-Id: Ib44d3f6972b3cdbca4d2f0a3034f53d9ae5bb2a8
2011-08-26 15:17:55 -07:00
Makoto Onuki
bd9e678dc4
am 754b394b: Merge "Define mime-types for stream items"
...
* commit '754b394bdfeff697bea73fa0977d2c91ef8c8886':
Define mime-types for stream items
2011-08-26 14:53:40 -07:00
Makoto Onuki
754b394bdf
Merge "Define mime-types for stream items"
2011-08-26 14:50:12 -07:00
Jeff Sharkey
47eb102b40
Always splice historical data stats, debug info.
...
When reading network counters, always splice in xt_qtaguid values
to avoid counting backwards. Test to verify.
Remove verbose logging around global alerts, and add dumpsys debug
info for NMS and MDST. Also fix subtle bug around stats persisting
and dumping.
Bug: 5212893, 5211028
Change-Id: I783e5286637a67ee2dd2b09878198711a926d0cb
2011-08-26 14:19:54 -07:00
Fabrice Di Meglio
d274fb7140
am d32f27ae: Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"
...
* commit 'd32f27aec04dd91edf488f280ca609e0b55aec9e':
Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL
2011-08-26 14:08:21 -07:00
Fabrice Di Meglio
d32f27aec0
Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"
2011-08-26 14:05:09 -07:00
Romain Guy
f1383763f0
am 80122c2a: Merge "Prevent crash in VPN settings Bug #5217245 "
...
* commit '80122c2a7a2cb25dbd80b3d193cbf593c0589e12':
Prevent crash in VPN settings Bug #5217245
2011-08-26 13:38:56 -07:00
Romain Guy
80122c2a7a
Merge "Prevent crash in VPN settings Bug #5217245 "
2011-08-26 13:37:35 -07:00
Romain Guy
eca9b1f53c
Prevent crash in VPN settings
...
Bug #5217245
Change-Id: Ibacf4cbd40537cd417f1518b5ac4367a3f3d7d03
2011-08-26 13:36:37 -07:00
Gilles Debunne
9684f5ea90
am 87a4d87e: Merge "Bug 5218421. Spell check crash with Japanese characters"
...
* commit '87a4d87ecf156affc23a5e2591d28ff5d5986fe0':
Bug 5218421. Spell check crash with Japanese characters
2011-08-26 13:30:54 -07:00
Gilles Debunne
87a4d87ecf
Merge "Bug 5218421. Spell check crash with Japanese characters"
2011-08-26 13:28:28 -07:00
John Reck
9f725654c7
am f4565a91: Merge "After calling loadData invalidate the content"
...
* commit 'f4565a91a514dc9e1105b6955a4c9aa3bc3e7a7b':
After calling loadData invalidate the content
2011-08-26 11:17:04 -07:00
John Reck
f4565a91a5
Merge "After calling loadData invalidate the content"
2011-08-26 11:15:29 -07:00
Gilles Debunne
d6e3494421
Bug 5218421. Spell check crash with Japanese characters
...
The word iterator returns no word in that case, and this is not
supported by TextInfo.
Change-Id: Iaf31c58638c02d3cdc7b88bc0d1201e793e84f17
2011-08-26 10:13:18 -07:00
satok
1984869df9
am 7926f62a: Fix newSpellCheckerSession
...
* commit '7926f62a073ed3a27d870cfa88ade33013d8010b':
Fix newSpellCheckerSession
2011-08-26 05:17:53 -07:00
satok
7926f62a07
Fix newSpellCheckerSession
...
Change-Id: Ia862dba70666c69b81d18836561b7e9a1c2d81b3
2011-08-26 21:13:35 +09:00
satok
185b1debd8
am ca6d29da: Merge "Support system locale as the locale of the spell checkers"
...
* commit 'ca6d29da777cffd40d9f3e38f95663ba1a2002c5':
Support system locale as the locale of the spell checkers
2011-08-26 02:56:53 -07:00
satok
b387954a92
Support system locale as the locale of the spell checkers
...
Bug: 5212035
Change-Id: I18d27e54b936cc7f4d6cc3c7100bce57f77f8f9f
2011-08-26 18:35:58 +09:00
satok
f92aed9295
am fbedf1a3: Fix NPE in setCurrentSpellCheckerSubtype
...
* commit 'fbedf1a3978d5dfc4a886e4c7107d4bc1923f740':
Fix NPE in setCurrentSpellCheckerSubtype
2011-08-26 00:15:34 -07:00
satok
fbedf1a397
Fix NPE in setCurrentSpellCheckerSubtype
...
Change-Id: I9fce999f91dcccd2f877a0326c4f2e3ac9024f85
2011-08-26 16:00:23 +09:00
satok
6981cc7622
am 2388a7ba: Add getServiceInfo to SpellCheckerInfo
...
* commit '2388a7ba6218f44400ee78016282cb96c02dfc54':
Add getServiceInfo to SpellCheckerInfo
2011-08-25 22:58:34 -07:00
satok
2388a7ba62
Add getServiceInfo to SpellCheckerInfo
...
Change-Id: I11634b88cf65182465869b131cfdcc8815e74965
2011-08-26 14:35:09 +09:00
satok
0f1162e3ff
am c7145319: Add getDisplayName to SpellCheckerSubtype
...
* commit 'c714531952fe1c22cae77631aa25dc7441b2b878':
Add getDisplayName to SpellCheckerSubtype
2011-08-25 22:18:05 -07:00
satok
c714531952
Add getDisplayName to SpellCheckerSubtype
...
Change-Id: Ic4d1f494a1fb67eda73ffc8e3be1caf690a602ce
2011-08-26 14:04:46 +09:00
satok
a08651734d
am 4bc554b3: Merge "Fix setCurrentSpellCheckerSubtype"
...
* commit '4bc554b37165dbee8d805a6f73ac5e946f2769ae':
Fix setCurrentSpellCheckerSubtype
2011-08-25 21:36:17 -07:00
satok
4bc554b371
Merge "Fix setCurrentSpellCheckerSubtype"
2011-08-25 21:34:44 -07:00
satok
3cb5b39a0e
Fix setCurrentSpellCheckerSubtype
...
Change-Id: Ib42a3b4377b8700ceaf4b7e13150848464d073c1
2011-08-26 12:39:42 +09:00
Fabrice Di Meglio
7810b5f8cf
Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL
...
- force TextView to LOCALE text heuristic when in "password" mode
- remove TEXT_LAYOUT_DIRECTION_UNKNOWN_DO_NOT_USE
- LocaleUtils.getLayoutDirectionFromLocale() returns "LTR" is locale is NULL or ROOT
Change-Id: I182c46aaf2d73c8b18967fffa230bfabec91ed06
2011-08-25 18:43:37 -07:00
Mathias Agopian
d24434784f
am 3efc794f: Merge "fix logging of eglMakeCurrent() errors"
...
* commit '3efc794f8563558b9792cc8ffa1ab9e81a0129ea':
fix logging of eglMakeCurrent() errors
2011-08-25 18:42:29 -07:00
Mathias Agopian
3efc794f85
Merge "fix logging of eglMakeCurrent() errors"
2011-08-25 18:40:31 -07:00
Mathias Agopian
ca07e34f13
fix logging of eglMakeCurrent() errors
...
Change-Id: Ie22cabff822a8fb3186f082491234b9503b431c3
2011-08-25 18:38:24 -07:00
Fred Quintana
fe569e8420
am d912ec64: Merge "add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter"
...
* commit 'd912ec64d2c49fb796e376a0592d3315fc2d369f':
add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter
2011-08-25 17:31:51 -07:00
Fred Quintana
d912ec64d2
Merge "add a way for the sync adapter to specify the activity that should be invoked to reach a settings screen for that sync adapter"
2011-08-25 17:30:03 -07:00
Fred Quintana
e6d60ecdf6
add a way for the sync adapter to specify the activity that should
...
be invoked to reach a settings screen for that sync adapter
Bug: 5204776
Change-Id: I4641067c1f0710c51f2633241a8c87bc4d568af2
2011-08-25 17:23:42 -07:00
John Reck
fb2b9b2695
After calling loadData invalidate the content
...
Bug: 5205296
Change-Id: I7470faf0b71a769926c007b964987e8bc7a61efb
2011-08-25 15:38:33 -07:00