OSDN Git Service
Adam Powell [Wed, 31 Aug 2011 00:42:48 +0000 (17:42 -0700)]
am
38e1c7a8: Merge "Ellipsize marquee TextViews that aren\'t currently animating"
* commit '
38e1c7a8a614a491747d08f91aa6eceaee8123fb':
Ellipsize marquee TextViews that aren't currently animating
Adam Powell [Wed, 31 Aug 2011 00:40:40 +0000 (17:40 -0700)]
Merge "Ellipsize marquee TextViews that aren't currently animating"
Adam Powell [Tue, 30 Aug 2011 23:51:11 +0000 (16:51 -0700)]
Ellipsize marquee TextViews that aren't currently animating
On some devices the fading edge effect can be expensive. Offer an
alternative for screens full of textviews.
Change-Id: I0382b4ea0f8b0c6948cb68611f3679dbf5e2898a
Jeff Brown [Wed, 31 Aug 2011 00:04:59 +0000 (17:04 -0700)]
am
25614758: Merge "Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect."
* commit '
256147581959868044bd92bad281c5c75a1068d7':
Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect.
Jeff Brown [Wed, 31 Aug 2011 00:03:37 +0000 (17:03 -0700)]
Merge "Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect."
Wink Saville [Tue, 30 Aug 2011 23:06:58 +0000 (16:06 -0700)]
am
960ba913: Merge "CDMALTE: Start reading SIM record on SIM_READY"
* commit '
960ba9132c02bfe2655268c2e5cb441c025c607f':
CDMALTE: Start reading SIM record on SIM_READY
Wink Saville [Tue, 30 Aug 2011 23:05:04 +0000 (16:05 -0700)]
Merge "CDMALTE: Start reading SIM record on SIM_READY"
Gilles Debunne [Tue, 30 Aug 2011 22:56:04 +0000 (15:56 -0700)]
am
b5305007: Merge "Add EditTextShortcutSpan to provide edit short cut in the text view."
* commit '
b5305007a6eb10457aa97b9791fed62d3542e3c1':
Add EditTextShortcutSpan to provide edit short cut in the text view.
Gilles Debunne [Tue, 30 Aug 2011 22:53:33 +0000 (15:53 -0700)]
Merge "Add EditTextShortcutSpan to provide edit short cut in the text view."
Dianne Hackborn [Tue, 30 Aug 2011 22:50:35 +0000 (15:50 -0700)]
am
9c93db60: Merge "Fix issues #
5233826 and #
5209847 -- live wallpapers."
* commit '
9c93db60e6d9172e1957e5e31a6c5b82e2494420':
Fix issues #
5233826 and #
5209847 -- live wallpapers.
Dianne Hackborn [Tue, 30 Aug 2011 22:47:17 +0000 (15:47 -0700)]
Merge "Fix issues #
5233826 and #
5209847 -- live wallpapers."
Justin Ho [Tue, 30 Aug 2011 22:43:36 +0000 (15:43 -0700)]
am
9b718682: Merge "Updated action bar/CAB assets Bug:
5156319 5076695"
* commit '
9b718682ed8fd06e38598f1a0a24d42025e9267d':
Updated action bar/CAB assets Bug:
5156319 5076695
Justin Ho [Tue, 30 Aug 2011 22:42:26 +0000 (15:42 -0700)]
Merge "Updated action bar/CAB assets Bug:
5156319 5076695"
Jean-Michel Trivi [Tue, 30 Aug 2011 22:15:14 +0000 (15:15 -0700)]
am
2261c7d6: Merge "Bug
5045498 Force display update when display registers"
* commit '
2261c7d6456376ed10a97643fc74a1e4eb2c1c9f':
Bug
5045498 Force display update when display registers
Jean-Michel Trivi [Tue, 30 Aug 2011 22:14:12 +0000 (15:14 -0700)]
Merge "Bug
5045498 Force display update when display registers"
Christopher Tate [Tue, 30 Aug 2011 22:12:05 +0000 (15:12 -0700)]
am
95901a1b: Merge "Fix JNI for warning about failure to unlink DeathRecipients"
* commit '
95901a1b8b9ee85a8cfe5603f6fa3cca15b2cb85':
Fix JNI for warning about failure to unlink DeathRecipients
Christopher Tate [Tue, 30 Aug 2011 22:09:54 +0000 (15:09 -0700)]
Merge "Fix JNI for warning about failure to unlink DeathRecipients"
Chia-chi Yeh [Tue, 30 Aug 2011 22:04:45 +0000 (15:04 -0700)]
am
1c75e966: Merge "SIP: add the check for expiry time in Contact header."
* commit '
1c75e966b28e3d13b91ec47e6d883f7c58a1f247':
SIP: add the check for expiry time in Contact header.
Chia-chi Yeh [Tue, 30 Aug 2011 22:02:59 +0000 (15:02 -0700)]
Merge "SIP: add the check for expiry time in Contact header."
Dianne Hackborn [Tue, 30 Aug 2011 21:06:51 +0000 (14:06 -0700)]
Fix issues #
5233826 and #
5209847 -- live wallpapers.
5233826 when a live wallpaper starts, it does so regardless of its visibility
The WallpaperService is now very forceful about telling a wallpaper it is
not visible when it first starts.
5209847 Make launcher turn off the wallpaper in all apps.
Fix a bug in the window manager that would not correctly handle the wallpaper
flag changing.
Change-Id: Ie3314043a84664be72a1304a1705408efd789a15
Jean-Michel Trivi [Tue, 30 Aug 2011 17:52:59 +0000 (10:52 -0700)]
Bug
5045498 Force display update when display registers
When an IRemoteControlDisplay registers, cause the
RemoteControlClient to send all its information to the newly
registered display.
The previous code was only sending a request for update: this
request didn't here cause the client to send the data because
a new client generation had not been synchronized among clients
and displays.
This CL uses the same code path to force an update as when audio
focus changes, or a new client registers, by calling the same
method that is called in those cases,
updateRemoteControlDisplay_syncRcs(flags).
Also in this CL: more method renames to indicate methods that
are called synchronized on mRCStack.
Change-Id: I54102f45ba1cd4812d958ecd883bec7bc45ae88f
Romain Guy [Tue, 30 Aug 2011 21:44:27 +0000 (14:44 -0700)]
am
853921fa: Merge "Text would disappear when the font size is 75px. Bug #
5230196"
* commit '
853921fa6ded5267c71f601beceda0f4cb94df9d':
Text would disappear when the font size is 75px. Bug #
5230196
Romain Guy [Tue, 30 Aug 2011 21:43:06 +0000 (14:43 -0700)]
Merge "Text would disappear when the font size is 75px. Bug #
5230196"
Romain Guy [Tue, 30 Aug 2011 21:41:48 +0000 (14:41 -0700)]
Text would disappear when the font size is 75px.
Bug #
5230196
Yes, 75px. Any other font size would work. Don't ask.
Change-Id: I96c7db9926a97f65128d60c8238c3640ee2444ba
Max Braun [Tue, 30 Aug 2011 21:35:45 +0000 (14:35 -0700)]
Pick up device configuration "device.internal = 0". Before, only "device.internal = 1" had an effect.
Change-Id: Ie88ed66e0841418c147bed2e23806405bdd17ad6
Jamie Gennis [Tue, 30 Aug 2011 21:40:24 +0000 (14:40 -0700)]
am
8d102eb6: Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
* commit '
8d102eb6720deccfb8b5872fde531ef6ca580077':
MediaDump: use the MediaPlayer#setSurface method
HTML5VideoView: switch to MediaPlayer#setSurface
MediaPlayer: unhide the setSurface method
Surface: unhide the SurfaceTexture ctor
Jamie Gennis [Tue, 30 Aug 2011 21:38:56 +0000 (14:38 -0700)]
Merge changes I33f59705,Ia4c8c822,I2fb695ab,I2e587afc
* changes:
MediaDump: use the MediaPlayer#setSurface method
HTML5VideoView: switch to MediaPlayer#setSurface
MediaPlayer: unhide the setSurface method
Surface: unhide the SurfaceTexture ctor
Justin Ho [Tue, 30 Aug 2011 21:08:52 +0000 (14:08 -0700)]
Updated action bar/CAB assets
Bug:
5156319 5076695
Change-Id: If80d0bf0d3ca4d6bf22ef6231380c07f73fe966b
Christopher Tate [Tue, 30 Aug 2011 19:09:43 +0000 (12:09 -0700)]
Fix JNI for warning about failure to unlink DeathRecipients
We now (a) use the right Class getName() method, and (b) look it
up once at setup time rather than doing that lookup every time we
want to emit the warning. Verified to work properly and no longer
crash or throw or otherwise complain.
Change-Id: If0767f8845588ba7f34bac21474f4e2ad5c111d6
Chia-chi Yeh [Tue, 30 Aug 2011 20:58:35 +0000 (13:58 -0700)]
SIP: add the check for expiry time in Contact header.
There can be three expiry times in the same message header. We
choose the smaller value in Expires header and Contact header,
and then we obey the value defined in Min-Expires header. If
none of them is set, the default value is used.
Bug:
5178284
Change-Id: Ie9d4a48c93863e82e5197bb4a0db3f4fec56857c
Jake Hamby [Tue, 30 Aug 2011 20:47:43 +0000 (13:47 -0700)]
am
be1a0493: Merge "Use the local timezone for CDMA SMS timestamps."
* commit '
be1a0493a8bf589137874bec4222297fbb712185':
Use the local timezone for CDMA SMS timestamps.
Jake Hamby [Tue, 30 Aug 2011 20:45:30 +0000 (13:45 -0700)]
Merge "Use the local timezone for CDMA SMS timestamps."
Fabrice Di Meglio [Tue, 30 Aug 2011 20:44:34 +0000 (13:44 -0700)]
am
c6f19da0: Merge "Fix bug #
5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug"
* commit '
c6f19da0ff703adff8a6a06e0b19ea46abada644':
Fix bug #
5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug
Fabrice Di Meglio [Tue, 30 Aug 2011 20:42:34 +0000 (13:42 -0700)]
Merge "Fix bug #
5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug"
Jim Miller [Tue, 30 Aug 2011 20:31:31 +0000 (13:31 -0700)]
am
25c82e6c: Merge "Fix
5233681,
5230897: Minor tweaks to lockscreen layout on tablets."
* commit '
25c82e6cb4d8c056b20bea361c513ff6cfaf8ba7':
Fix
5233681,
5230897: Minor tweaks to lockscreen layout on tablets.
Jim Miller [Tue, 30 Aug 2011 20:29:24 +0000 (13:29 -0700)]
Merge "Fix
5233681,
5230897: Minor tweaks to lockscreen layout on tablets."
Dave Santoro [Tue, 30 Aug 2011 20:14:17 +0000 (13:14 -0700)]
am
d49eea78: Merge "Profile API modifications."
* commit '
d49eea7831d7386fc429984eee0e8ef117a1d927':
Profile API modifications.
Dave Santoro [Tue, 30 Aug 2011 20:12:50 +0000 (13:12 -0700)]
Merge "Profile API modifications."
Claudia de Veaux [Tue, 30 Aug 2011 18:07:07 +0000 (11:07 -0700)]
am
fbc4fe3e: Merge "Remove unnecessary parenthesees in "No service" lock screen string. Bug:
5221160"
* commit '
fbc4fe3e329285b17f2586c81d6894355dd32b12':
Remove unnecessary parenthesees in "No service" lock screen string. Bug:
5221160
Claudia de Veaux [Tue, 30 Aug 2011 18:05:31 +0000 (11:05 -0700)]
Merge "Remove unnecessary parenthesees in "No service" lock screen string. Bug:
5221160"
Eric Laurent [Tue, 30 Aug 2011 17:53:47 +0000 (10:53 -0700)]
am
0e35c78d: Merge "226483: A2DP connected, but music out to speaker"
* commit '
0e35c78d25a8df8b3bde566ad6c474f9df242ea4':
226483: A2DP connected, but music out to speaker
Eric Laurent [Tue, 30 Aug 2011 17:51:54 +0000 (10:51 -0700)]
Merge "226483: A2DP connected, but music out to speaker"
Scott Main [Tue, 30 Aug 2011 17:34:04 +0000 (10:34 -0700)]
am
d0116b68: cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a docs: fix ndk filename
* commit '
d0116b680a2c194eb3b8713a230151bfb32a6aef':
cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a docs: fix ndk filename
Scott Main [Tue, 30 Aug 2011 17:27:58 +0000 (10:27 -0700)]
cherrypick Change-Id: I2ff5eb2a8e86c0ec30eba4d904221b2e5384d05a
docs: fix ndk filename
Change-Id: I7de46a11733bc262aaba61346d334de555408c85
Scott Main [Tue, 30 Aug 2011 17:26:09 +0000 (10:26 -0700)]
am
44325215: cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5 docs: add ndk r6b sums and sizes
* commit '
44325215f03ba8b214330c68055181761d388607':
cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5 docs: add ndk r6b sums and sizes
Robert Ly [Tue, 30 Aug 2011 17:26:02 +0000 (10:26 -0700)]
am
ba812693: cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
* commit '
ba8126938e8ec82502e9db9594ef7036fa4a4b13':
cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e docs: ndk r6b rel notes
Scott Main [Tue, 30 Aug 2011 16:35:40 +0000 (09:35 -0700)]
cherrypick Change-Id: If9ee878fcd7e2ef3161edf58dc3ac98ed9399ea5
docs: add ndk r6b sums and sizes
Change-Id: I6a72bc2b3c21115208b067a8246b9aa7e70b8738
Robert Ly [Tue, 23 Aug 2011 17:47:28 +0000 (10:47 -0700)]
cherrypick Change-Id: I52ed6e5a97f32d2395cf171009b0b650268cac4e
docs: ndk r6b rel notes
Change-Id: I3512f11370ddbfbe6c70efe59f216b5c4ea84ae7
Eric Laurent [Tue, 30 Aug 2011 17:18:54 +0000 (10:18 -0700)]
226483: A2DP connected, but music out to speaker
When the A2DP headset is connected, there is a possible
race condition when the audio tracks are moved from
the mixer thread attached to the speaker output to the thread
attached to A2DP output.
As the request to clear the stream type to output mapping cache in
the client process is asynchronous, it is possible that the flag
indicating to the client audio track to re-create the IAudioTrack
on the new thread is processed before the cache is invalidated.
In this case, the track will be attached to the old thread and
music will continue playing over the device speaker instead of being
redirected to A2DP headset.
Change-Id: Ib2ce1eb5320eaff83287b93779061bf4e7a330df
Tsu Chiang Chuang [Tue, 30 Aug 2011 17:14:08 +0000 (10:14 -0700)]
am
67112061: Merge "Adding bandwidth enforcement test app."
* commit '
67112061b2a68e4e6f76fb45f7a2285925d6b1cb':
Adding bandwidth enforcement test app.
Tsu Chiang Chuang [Tue, 30 Aug 2011 17:12:44 +0000 (10:12 -0700)]
Merge "Adding bandwidth enforcement test app."
Luca Zanolin [Tue, 30 Aug 2011 17:04:34 +0000 (18:04 +0100)]
Add EditTextShortcutSpan to provide edit short cut in the text view.
At the moment, EditTextShortcutSpan allows only the deletion of the text. In the future, we may decide to add extra functionality,
like "retry" where all the text is removed and a specific IME is triggered.
Fix the underline. The underline is not defined in thickness, and not as a multiplier of the default underline thickness.
Change the behaviour of SuggestionRangeSpan to match the specification.
Change-Id: I80437d9887c7a2ff8f62c38afbb0cb7add7ee9c8
Mike Lockwood [Tue, 30 Aug 2011 17:01:05 +0000 (10:01 -0700)]
Merge "Make Serial Manager APIs public" into ics-aah
Mike Lockwood [Tue, 30 Aug 2011 16:59:33 +0000 (09:59 -0700)]
Merge "Quick and dirty test app for new SerialPort API" into ics-aah
Mike Lockwood [Tue, 30 Aug 2011 16:59:19 +0000 (09:59 -0700)]
Merge "New Serial Manager API:" into ics-aah
Mike Lockwood [Tue, 30 Aug 2011 16:10:26 +0000 (12:10 -0400)]
Make Serial Manager APIs public
Change-Id: I9b96ff288a4757c4c4465a6a5ea3b4ed9c432e06
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 30 Aug 2011 00:34:56 +0000 (20:34 -0400)]
Quick and dirty test app for new SerialPort API
Change-Id: Ie1ae6e7387b9f1e2788b798de29a06d551a44d1d
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Tue, 30 Aug 2011 00:11:07 +0000 (20:11 -0400)]
New Serial Manager API:
SerialManager: provides access to serial ports
SerialPort: for reading and writing data to and from serial ports
IO with both array based and direct ByteBuffers is supported.
Accessing serial ports requires android.permission.SERIAL_PORT permission
Each platform must configure list of supported serial ports in the
config_serialPorts resource overlay
(this is needed to prevent apps from accidentally accessing the bluetooth
or other system UARTs).
In addition, the platform uevent.rc file must set the owner to the
/dev/tty* files to "system" so the framework can access the port.
Change-Id: I6afa78ceacf08486aaebced4156ecd2e33051879
Signed-off-by: Mike Lockwood <lockwood@android.com>
Narayan Kamath [Tue, 30 Aug 2011 16:54:49 +0000 (09:54 -0700)]
am
5cdc720d: Merge "Don\'t allow TTS engines to synthesize too for ahead."
* commit '
5cdc720dcadaa517766abb8a2f176de1a78a26a8':
Don't allow TTS engines to synthesize too for ahead.
Narayan Kamath [Tue, 30 Aug 2011 16:52:06 +0000 (09:52 -0700)]
Merge "Don't allow TTS engines to synthesize too for ahead."
Gilles Debunne [Tue, 30 Aug 2011 16:49:31 +0000 (09:49 -0700)]
am
ce4afc14: Merge "Moving action popup window when moving text selection"
* commit '
ce4afc1425cf74b7168a2d3d35c54efe9b5c98af':
Moving action popup window when moving text selection
Gilles Debunne [Tue, 30 Aug 2011 16:47:30 +0000 (09:47 -0700)]
am
4cbcc2bc: Merge "Bug
5218421: new NPE is SpellChecker when using Japanese language"
* commit '
4cbcc2bc06cb228c2c5374920d2d4038685de8a6':
Bug
5218421: new NPE is SpellChecker when using Japanese language
Gilles Debunne [Tue, 30 Aug 2011 16:46:30 +0000 (09:46 -0700)]
Merge "Moving action popup window when moving text selection"
Gilles Debunne [Tue, 30 Aug 2011 16:45:46 +0000 (09:45 -0700)]
Merge "Bug
5218421: new NPE is SpellChecker when using Japanese language"
Jean-Michel Trivi [Tue, 30 Aug 2011 16:08:02 +0000 (09:08 -0700)]
am
c5d0fac0: Merge "Bug
5156756 Fix AAC ADTS header size computation"
* commit '
c5d0fac081c4c496b29586bff79dfff05755b716':
Bug
5156756 Fix AAC ADTS header size computation
Jean-Michel Trivi [Tue, 30 Aug 2011 16:06:36 +0000 (09:06 -0700)]
Merge "Bug
5156756 Fix AAC ADTS header size computation"
Mike Lockwood [Tue, 30 Aug 2011 15:47:21 +0000 (08:47 -0700)]
am
7c267b24: Merge "Extinguish notification LED when user passes through lock screen"
* commit '
7c267b24c69685ee623efb61bd98707869e92f5d':
Extinguish notification LED when user passes through lock screen
Mike Lockwood [Tue, 30 Aug 2011 15:46:18 +0000 (08:46 -0700)]
Merge "Extinguish notification LED when user passes through lock screen"
Mike Lockwood [Tue, 30 Aug 2011 13:55:30 +0000 (09:55 -0400)]
Extinguish notification LED when user passes through lock screen
Also do not blink for notifications received when the screen is on.
Bug:
5233071
Change-Id: I15675ca317007d4b900ef74e60d11a5bca3d7333
Signed-off-by: Mike Lockwood <lockwood@android.com>
Svetoslav Ganov [Tue, 30 Aug 2011 05:11:52 +0000 (22:11 -0700)]
am
173cc7c8: Merge "Adding accessibility support to the slide lock screen"
* commit '
173cc7c86a7226e4167b2c0626a97d57aaca0d0a':
Adding accessibility support to the slide lock screen
Svetoslav Ganov [Tue, 30 Aug 2011 05:09:56 +0000 (22:09 -0700)]
Merge "Adding accessibility support to the slide lock screen"
Svetoslav Ganov [Sat, 27 Aug 2011 03:12:02 +0000 (20:12 -0700)]
Adding accessibility support to the slide lock screen
bug:
5210233
Change-Id: I93e876524ae6aaf75aadbe6a21c5c17d41a705f0
Jim Miller [Tue, 30 Aug 2011 03:43:12 +0000 (20:43 -0700)]
Fix
5233681,
5230897: Minor tweaks to lockscreen layout on tablets.
- Remove negative padding required by old font which is no longer
required by the new clock font.
- Change brightness of AM/PM indicator to white.
Change-Id: I10540a2976a47014e535f958e07d1c61fa0d8d41
Rajneesh Chowdury [Tue, 30 Aug 2011 03:45:06 +0000 (20:45 -0700)]
am
90200ee4: Merge "
5106773 Can\'t export a movie - Error returned from OMX API in ducati"
* commit '
90200ee4e23b662e81a8d6fb6ef634ac6b378f5f':
5106773 Can't export a movie - Error returned from OMX API in ducati
Rajneesh Chowdury [Tue, 30 Aug 2011 03:43:11 +0000 (20:43 -0700)]
Merge "
5106773 Can't export a movie - Error returned from OMX API in ducati"
Rajneesh Chowdury [Tue, 30 Aug 2011 03:16:22 +0000 (20:16 -0700)]
5106773 Can't export a movie - Error returned from OMX API in ducati
Video Editor engine wrongly set the profile in place of level.
So level was always 1 (default value for Profile)
Change-Id: I202f866d32e81869d9692174d59d9d777a772282
Jeff Sharkey [Tue, 30 Aug 2011 03:01:46 +0000 (20:01 -0700)]
am
4107beec: Merge "Introduce immediate CONNECTIVITY_ACTION variant."
* commit '
4107beecaab18b393e56a0c34b333f0a6e15be2f':
Introduce immediate CONNECTIVITY_ACTION variant.
Jeff Sharkey [Tue, 30 Aug 2011 03:00:12 +0000 (20:00 -0700)]
Merge "Introduce immediate CONNECTIVITY_ACTION variant."
Jean-Michel Trivi [Mon, 29 Aug 2011 21:06:51 +0000 (14:06 -0700)]
Bug
5156756 Fix AAC ADTS header size computation
This previous frame size computation code had two incorrect
assumptions:
1/ the ADTS frame length value already contains the header size
2/ the ADTS header is not of fixed size: it is 2 bytes bigger
if it contains the CRC value.
For 1/, the code worked because when the header size was added
to the frame size, the + operator is of stronger precedence
than the ? operator, so the size added was always 0 (instead
of ADTS_HEADER_LENGTH.
For 2/, the code worked as long as there was no CRC in the ADTS
data.
The fix consists in:
- documenting what the frame length computation code returns
- fixing the frame length computation
- when computing the frame length, also returning the header
size so the correct data can be sent to the decoder.
Change-Id: I92df72a9e531f594f762e63d62f9dee7b0109904
Dianne Hackborn [Tue, 30 Aug 2011 01:42:29 +0000 (18:42 -0700)]
am
42930641: Merge "Fix issues
5158104 and
4981556 (fragment problems)"
* commit '
42930641792ecd23fee6b2913ba1e7cf24634f3d':
Fix issues
5158104 and
4981556 (fragment problems)
Dianne Hackborn [Tue, 30 Aug 2011 01:40:21 +0000 (18:40 -0700)]
Merge "Fix issues
5158104 and
4981556 (fragment problems)"
Jim Miller [Tue, 30 Aug 2011 01:32:42 +0000 (18:32 -0700)]
am
476769b4: Merge "Fix
5044158: Integrate music transport control into LockScreen"
* commit '
476769b42f38ebf943ea859d98faa94fdc38eec1':
Fix
5044158: Integrate music transport control into LockScreen
Jim Miller [Tue, 30 Aug 2011 01:30:44 +0000 (18:30 -0700)]
Merge "Fix
5044158: Integrate music transport control into LockScreen"
Jim Miller [Tue, 9 Aug 2011 05:27:58 +0000 (22:27 -0700)]
Fix
5044158: Integrate music transport control into LockScreen
This integrates a new version of TransportControlView into LockScreen
and adds plumbing to handle new AudioService events to show/hide the view
and updates the required assets for all devices.
Updated to use new AudioManager API. Since the current API only supports
one RCD, the handler now lives in TransportControlView.
Change-Id: I220d4dd760bef35bd84209adc3c5829bf5bc9a2c
Christopher Tate [Tue, 30 Aug 2011 01:13:50 +0000 (18:13 -0700)]
am
37656214: Merge "Un-hide the new BackupAgent.onFullBackup() API"
* commit '
376562143436353bbd745d3cce413f649a09dda8':
Un-hide the new BackupAgent.onFullBackup() API
Christopher Tate [Tue, 30 Aug 2011 01:11:38 +0000 (18:11 -0700)]
Merge "Un-hide the new BackupAgent.onFullBackup() API"
Dianne Hackborn [Mon, 29 Aug 2011 23:53:49 +0000 (16:53 -0700)]
Fix issues
5158104 and
4981556 (fragment problems)
5158104: com.android.contacts: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState at
android.app.FragmentManagerImpl.checkStateLoss(FragmentManager.java:1201)
The ViewPager can just commit without worrying about a state loss,
since it can correctly reconstruct its state later.
4981556: Fragment.mImmediateActivity doesn't get restored on orientation change
I am giving up on this thing; I just don't see how it can actually
be correct. So now instead of getting an exception about a dup
add/remove at point of the add/remove call, this will happen later when
processing the transaction.
Also add an API for controlling the visibility of menus, which ViewPager
can use to have the correct menus shows. And add a method to get the
name of a back stack entry.
Change-Id: Idcba14cfa2a172545a7a2a2c466cb49ceb789619
Irfan Sheriff [Tue, 30 Aug 2011 00:38:33 +0000 (17:38 -0700)]
am
f99360bf: Merge "Initialize p2p settings"
* commit '
f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89':
Initialize p2p settings
Irfan Sheriff [Tue, 30 Aug 2011 00:36:50 +0000 (17:36 -0700)]
Merge "Initialize p2p settings"
John Reck [Tue, 30 Aug 2011 00:16:14 +0000 (17:16 -0700)]
am
30cca602: Merge "Fix contentInvalidateAll NPE"
* commit '
30cca6020df6fede4043a9f6715be470d3132c57':
Fix contentInvalidateAll NPE
John Reck [Tue, 30 Aug 2011 00:14:11 +0000 (17:14 -0700)]
Merge "Fix contentInvalidateAll NPE"
Matthew Xie [Mon, 29 Aug 2011 23:34:05 +0000 (16:34 -0700)]
am
d56b3c95: Merge "Move Bluetooth remove service record handler to the app main thread"
* commit '
d56b3c952469a63aa9d4fc860be24b80a4b0e3b6':
Move Bluetooth remove service record handler to the app main thread
Jim Miller [Mon, 29 Aug 2011 23:33:51 +0000 (16:33 -0700)]
am
f0eb7655: Merge "Fix
5044158: Reduce overall memory footprint of lockscreen"
* commit '
f0eb7655ac897ca06034296f7674b73a65f0e8a9':
Fix
5044158: Reduce overall memory footprint of lockscreen
Daniel Lehmann [Mon, 29 Aug 2011 23:33:38 +0000 (16:33 -0700)]
am
82e0c6f3: Merge "Add the lookup_key column, which should have been in the previous CL"
* commit '
82e0c6f3dec5c7359166b9ff720f9fcc8c6801d7':
Add the lookup_key column, which should have been in the previous CL
Wink Saville [Mon, 29 Aug 2011 23:33:30 +0000 (16:33 -0700)]
am
03605fa8: Merge "Fix leak in SIM ready registrants"
* commit '
03605fa832ea42dedca00fc7798a6da6c8a6c8a3':
Fix leak in SIM ready registrants
James Dong [Mon, 29 Aug 2011 23:33:14 +0000 (16:33 -0700)]
am
2a451021: Merge "The test application falsely reports that the test result even if the test failed."
* commit '
2a45102186a25877df04404d591171b2b2e85626':
The test application falsely reports that the test result even if the test failed.
Irfan Sheriff [Mon, 29 Aug 2011 23:33:00 +0000 (16:33 -0700)]
am
335e40c0: Merge "Use seperate config file for p2p"
* commit '
335e40c0f1c3aec550e61fa159130527fda597b6':
Use seperate config file for p2p
Jason Simmons [Mon, 29 Aug 2011 23:31:23 +0000 (16:31 -0700)]
Merge "resolved conflicts for merge of
35c0bf31 to ics-aah" into ics-aah
Jake Hamby [Mon, 29 Aug 2011 23:25:07 +0000 (16:25 -0700)]
Use the local timezone for CDMA SMS timestamps.
3GPP2 uses the local timezone for timestamps in SMS messages.
Use the local timezone instead of UTC when decoding bearer data.
Bug:
5123883
Change-Id: Iec25bcbb7862f0794ead80b6923c815b68bdd2a5
Matthew Xie [Mon, 29 Aug 2011 23:27:54 +0000 (16:27 -0700)]
Merge "Move Bluetooth remove service record handler to the app main thread"