Adam Powell
47d129bcb9
am 6b316513: Merge "Fix bug 5067075 - missing scrollbar when entering long signatures"
...
* commit '6b316513e8ce5c35cafacbeb3b9428fc5c06df67':
Fix bug 5067075 - missing scrollbar when entering long signatures
2011-08-28 17:00:22 -07:00
Adam Powell
dfab05095f
am 63543e29: Merge "Fix bug 5133509 - Align holo menu panel windows along the bottom of the screen"
...
* commit '63543e299764ac5a904dadd8b45e9ce301ea1023':
Fix bug 5133509 - Align holo menu panel windows along the bottom of the screen
2011-08-28 17:00:19 -07:00
Adam Powell
6b316513e8
Merge "Fix bug 5067075 - missing scrollbar when entering long signatures"
2011-08-28 16:58:54 -07:00
Adam Powell
63543e2997
Merge "Fix bug 5133509 - Align holo menu panel windows along the bottom of the screen"
2011-08-28 16:58:27 -07:00
Jim Miller
1479e48302
am 816879f2: Merge "Fix 5216579: Don\'t show IME switch option in numeric mode of lockscreen"
...
* commit '816879f2d57a22394816b5a405f9e15e6ac56b3b':
Fix 5216579: Don't show IME switch option in numeric mode of lockscreen
2011-08-28 15:11:56 -07:00
Jim Miller
816879f2d5
Merge "Fix 5216579: Don't show IME switch option in numeric mode of lockscreen"
2011-08-28 15:10:27 -07:00
Jim Miller
b0166bc62f
Fix 5216579: Don't show IME switch option in numeric mode of lockscreen
...
Since LockScreen provides its own PIN entry keyboard, we don't need to show
the IME switcher button.
Change-Id: I04528acaee66e5109d631c0c79a3e7c64876e4c5
2011-08-28 15:00:29 -07:00
Pannag Sanketi
982f7c7027
am 3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"
...
* commit '3451df1a5cc1547fe1061a482a50a639fcc0e8e4':
Default W, H allowed in SurfaceMediaSource dequeue
2011-08-28 14:42:33 -07:00
Pannag Sanketi
3451df1a5c
Merge "Default W, H allowed in SurfaceMediaSource dequeue"
2011-08-28 14:40:26 -07:00
Adam Powell
c82c7a5403
Fix bug 5067075 - missing scrollbar when entering long signatures
...
Let DialogPreferences decide their own IME adjust mode as normal
rather than forcing adjustPan.
Change-Id: Ib53e9f648342430640469a0682308b056e7ef991
2011-08-28 14:36:05 -07:00
Adam Powell
67ed6c7224
Fix bug 5133509 - Align holo menu panel windows along the bottom of
...
the screen
Alter preferred options panel gravity policy.
Integrate new menu panel assets for holo apps.
Change-Id: I9fa98ed9359148ea6d1f1d1e727ddcd437b16e2f
2011-08-28 13:23:02 -07:00
Pannag Sanketi
ea77147ee5
am b8a9e15c: Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
...
* commit 'b8a9e15c2aa3d317834555244a90f184b46e1dcb':
Modify enum value of OMX_COLOR_FormatAndroidOpaque
2011-08-26 20:08:09 -07:00
Pannag Sanketi
b8a9e15c2a
Merge "Modify enum value of OMX_COLOR_FormatAndroidOpaque"
2011-08-26 20:05:58 -07:00
Pannag Sanketi
a033f38673
am 2b9c5d8a: Merge "Fixing small syntax error in MPEG4 logging"
...
* commit '2b9c5d8a89065ab18e58d79ae65a81267b248e1c':
Fixing small syntax error in MPEG4 logging
2011-08-26 20:03:09 -07:00
Pannag Sanketi
2b9c5d8a89
Merge "Fixing small syntax error in MPEG4 logging"
2011-08-26 20:01:46 -07:00
Pannag Sanketi
4da5660eee
Modify enum value of OMX_COLOR_FormatAndroidOpaque
...
The enum value chosen earlier had a conflict with one of the vendors.
Change-Id: I47832dd1157447f89324d56e8ab146260cd7927c
2011-08-26 19:38:13 -07:00
Adam Powell
4d94a5b421
am 441cc7db: Merge "Accessibility fixes for action bars"
...
* commit '441cc7dba318127ffd2f38e5c5d7993fb4326e03':
Accessibility fixes for action bars
2011-08-26 19:33:59 -07:00
Adam Powell
441cc7dba3
Merge "Accessibility fixes for action bars"
2011-08-26 19:32:09 -07:00
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
Pannag Sanketi
5cfcfb22d6
Fixing small syntax error in MPEG4 logging
...
Found that the build was breaking when the logging was enabled in
MPEG4Writer. Fixed.
Change-Id: I62c5e6d16b2ecf5644c8d46b9bbcca68a797b223
2011-08-26 19:18:57 -07:00
Adam Powell
7bc3ca0dc5
Accessibility fixes for action bars
...
Fix bug 5220543 - fix accessibility events for action buttons
Fix bug 5224260 - fix accessibility events for home/up
Change-Id: I7d55b4819862e1eda0809da92c52ec2d97f36af0
2011-08-26 18:31:47 -07:00
Svetoslav Ganov
e9709dcfda
am d96dbbe3: Merge "Lock screen should be kept on while it is touch explored."
...
* commit 'd96dbbe3356d6863c13134e545d281a56443f9b1':
Lock screen should be kept on while it is touch explored.
2011-08-26 18:19:50 -07:00
Jean-Michel Trivi
90abf18e6e
am 28c5b96d: Merge "Address multiple RemoteControlDisplay competing for registration"
...
* commit '28c5b96d840c24947fd29f2e65646ff37f5dc7ff':
Address multiple RemoteControlDisplay competing for registration
2011-08-26 18:19:47 -07:00
Svetoslav Ganov
d96dbbe335
Merge "Lock screen should be kept on while it is touch explored."
2011-08-26 18:18:04 -07:00
Jean-Michel Trivi
28c5b96d84
Merge "Address multiple RemoteControlDisplay competing for registration"
2011-08-26 18:17:40 -07:00
Jean-Michel Trivi
18e7bce523
Address multiple RemoteControlDisplay competing for registration
...
The RemoteControlClient / Display feature only supports one
display. If multiple displays are registered, this CL implements
the following policy:
- cannot unregister a display that is not the current one,
- registering a display when another is already registered
causes the old one to be unregistered.
This fixes a death handler leak where the previous display was
simply overwritten, without unlinking to its death.
Change-Id: I63f8a38093796e0960761936d7fc58d47b7589b3
2011-08-26 18:14:29 -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
Wink Saville
eb41603c4d
am 3ffb8897: Merge "Add timezone to the terminal response for provide local information command"
...
* commit '3ffb889746b881575d6ce4e33ef1835d71fb31ef':
Add timezone to the terminal response for provide local information command
2011-08-26 16:55:38 -07:00
Wink Saville
3ffb889746
Merge "Add timezone to the terminal response for provide local information command"
2011-08-26 16:53:39 -07:00
Jake Hamby
b3d7836e73
am bbf6a409: Merge "Add ISIM application support for LTE devices."
...
* commit 'bbf6a409e9e3a814be71755be135602cc4122da1':
Add ISIM application support for LTE devices.
2011-08-26 16:50:28 -07:00
Jake Hamby
bbf6a409e9
Merge "Add ISIM application support for LTE devices."
2011-08-26 16:47:45 -07:00
John Grossman
e5d08021a7
Merge "Media framework changes for Tungsten." into ics-aah
2011-08-26 16:41:57 -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
Chet Haase
4c340652f8
Merge "Fixed error in invalidation/LayoutTransition logic"
2011-08-26 16:26: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
Christopher Tate
b4ff29381f
am 97c06141: Merge "Warn if we\'re tearing down "live" DeathRecipient content [take 2]"
...
* commit '97c06141f0ee4013076dc63af3337535c1df7e61':
Warn if we're tearing down "live" DeathRecipient content [take 2]
2011-08-26 16:19:55 -07:00
Eric Fischer
9f99c878d9
am 03b1fecd: Merge "Import revised translations."
...
* commit '03b1fecd53e299f7473c6a947059638dfe76866e':
Import revised translations.
2011-08-26 16:19:50 -07:00
Christopher Tate
97c06141f0
Merge "Warn if we're tearing down "live" DeathRecipient content [take 2]"
2011-08-26 16:17:50 -07:00
Eric Fischer
03b1fecd53
Merge "Import revised translations."
2011-08-26 16:17:31 -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
Gilles Debunne
7793448250
am 754289a8: Merge "Changed PreferenceCategory left padding."
...
* commit '754289a8956cbc43ea724fd68f808efa27404a3a':
Changed PreferenceCategory left padding.
2011-08-26 16:00:27 -07:00
Gilles Debunne
38a7ebf56d
am e1770fd1: Merge "Text selection handle animations made faster."
...
* commit 'e1770fd1abdfe7378552831f387a88ef5353db98':
Text selection handle animations made faster.
2011-08-26 16:00:24 -07:00
Gilles Debunne
754289a895
Merge "Changed PreferenceCategory left padding."
2011-08-26 15:58:17 -07:00
Gilles Debunne
e1770fd1ab
Merge "Text selection handle animations made faster."
2011-08-26 15:57:57 -07:00