Joe Onorato
1e2c0d231e
Merge "For events, require that the parameters be marked in." into ics-aah
2011-11-08 17:36:35 -08:00
Eric Fischer
7a6ce3465c
Import revised translations. DO NOT MERGE
...
Change-Id: I46ccb7f02a64e3e6c7597b0dc295450b4f5625e6
2011-11-08 17:36:34 -08:00
Jeff Sharkey
4abb1b8ef6
Make operation counts monotonically increase.
...
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
Joe Onorato
2037c2585c
For events, require that the parameters be marked in.
...
(because they won't work otherwise)
Change-Id: I77f370ca1bc381ea07fc2854d2a90d8138ca1796
2011-11-08 17:35:09 -08:00
Dianne Hackborn
d4d32c594f
Don't crash if there is no connectivity service.
...
Change-Id: I5f991896125fda22ff99b98a6aca244adbb17449
2011-11-08 17:33:59 -08:00
Svetoslav Ganov
1bef480b22
Merge "NumberPicker incorectly enforcing minimal width and height." into ics-mr1
2011-11-08 17:33:49 -08:00
Glenn Kasten
19998120f5
Merge "Bug 5478024 drop after decode if can't drop before" into ics-mr0
2011-11-08 17:31:32 -08:00
Peter Ng
f804e06078
Making quicksettings opaque again
...
Bug:5522957
Change-Id: I27e9e78f4e706333f9a363b3d97ae6f602321173
2011-11-08 17:28:56 -08:00
Jeff Sharkey
ccdeb428ef
Merge "Avoid inconsistent state when remove fails." into ics-mr1
2011-11-08 17:27:03 -08:00
Jeff Brown
bc0b010ecc
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1
2011-11-08 17:22:06 -08:00
Mathias Agopian
393e2c1f7a
Merge "SensorService now always clamps the requested rate" into ics-mr1
2011-11-08 17:20:59 -08:00
Mathias Agopian
47f1fe5285
decrease the light-sensor rate to 1Hz (from ~15Hz) for ALS purposes.
...
the intent here is to save power.
Change-Id: I6cc1cae865cc46551afcfcec9ca03faaa5b6936f
2011-11-08 17:19:55 -08:00
Jeff Sharkey
3f3115b277
Make policy data enabled flag static.
...
For devices with both CDMA and GSM stack, ConnectivityService only
connects with the GSM variant. Making this flag static communicates
the policy state between all DCT.
Bug: 5586935
Change-Id: Iff0384027303470dd382d5173558d2d091ce4bf6
2011-11-08 17:15:46 -08:00
Dianne Hackborn
3af8b88d03
Merge "Add drop box reports of low memory." into ics-mr1
2011-11-08 17:01:05 -08:00
Michael Kolb
a4293ba1a0
Merge "Remove flicker from WebTextView" into ics-mr1
2011-11-08 16:34:53 -08:00
Jamie Gennis
d211b4882a
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
2011-11-08 16:15:26 -08:00
Jamie Gennis
911263dc5d
Merge changes I18e5e789,I5cbaae2d into ics-mr1
...
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
2011-11-08 16:14:44 -08:00
Mathias Agopian
95482b61c3
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
2011-11-08 15:55:55 -08:00
Jamie Gennis
d90bf3911d
EGL: implement loading and saving the cache
...
This change adds support for saving and loading the contents of the EGL
cache. It also adds some simple tests for the EGL cache.
Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
2011-11-08 15:54:36 -08:00
David Brown
1a811695f9
Add "potential" variants for PhoneNumberUtils.isEmergencyNumber()
...
The phone app needs a way to distinguish between (a) numbers that are
definitely emergency numbers, and (b) numbers that *might* result in an
emergency call being dialed, but aren't specifically emergency numbers
themselves.
(The phone app needs this distinction in order to enforce the restriction
that 3rd party apps should not be allowed to make emergency calls using
the ACTION_CALL intent, while still making sure that the in-call UI only
displays the "emergency call" state for numbers that are *definitely*
emergency numbers. See bug 5493790 for the full details;)
So this change adds a full set of "isPotentialEmergencyNumber()" methods
to go along with the "isEmergencyNumber()" methods we've had all along.
The "potential" variants behave identically to the original methods,
*except* that they ultimately use number.startsWith() rather than
number.equals() when comparing against the list of emergency numbers.
TESTED:
- Unit test 'PhoneNumberUtilsTest#testIsEmergencyNumber' passes.
(The PhoneNumberUtilsTest class doesn't pass in its entirety, but it was
broken before this change also.)
- Also see the commit description of change
Ib949fea3c0ce6b341a90e617a03ba3f22c69018b for the exact tests I ran
against the phone app.
This change should be submitted along with
Change-Id: Ib949fea3c0ce6b341a90e617a03ba3f22c69018b
in apps/Phone (but this change must go in first to avoid breaking the
build.)
Bug: 5493790
Change-Id: Ic528cfcc555734cdaf4ca8a18a50199771ba49b1
2011-11-08 15:51:50 -08:00
Irfan Sheriff
59c73b92a9
Merge "Convert soft ap config store to state machine" into ics-mr1
2011-11-08 15:51:43 -08:00
Irfan Sheriff
9575a1bea1
Convert soft ap config store to state machine
...
- Create thread when needed
- asynchronous interaction with wifi state machine
Bug: 5587391
Change-Id: Ie6d01b5a6b398a3fa12c384920a473e242443131
2011-11-08 15:45:42 -08:00
Dianne Hackborn
e4d4fbc8c0
Add drop box reports of low memory.
...
We are tagging these as "watchdog" to make them visible in the
reporting tools.
Also new am command to kill all background processes, mostly to make
it easier to test this stuff.
Change-Id: Ib9dc4747cd8bd44156fdf11d6a087cd4272203eb
2011-11-08 15:44:34 -08:00
Andreas Huber
a1b3e3d49e
Send RTSP control connection keep-alive requests
...
default to 60 secs unless overridden by server's session-id response.
Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug: 5562303
2011-11-08 15:39:15 -08:00
John Reck
d6ac727234
Fix determining find on page overlap
...
Bug: 5572138
Change-Id: Ie528e1cf9df363307018e01a898e8d9dfff1cd45
2011-11-08 15:00:17 -08:00
Dave Santoro
b78ae7524e
Merge "Unhide social stream APIs for Contacts." into ics-mr1
2011-11-08 14:48:21 -08:00
Jeff Brown
1a69318266
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
...
Bug: 5569662
Change-Id: Ib8cb9fb68a1a2d3520f34f7fbf6f002dfb91809d
2011-11-08 14:45:59 -08:00
Adam Powell
650a3e8894
Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
2011-11-08 14:32:29 -08:00
Michael Kolb
39036ace76
Remove flicker from WebTextView
...
Bug: 5522186
Update LayoutParams when position changed only
Change-Id: I54beb489c261090d7ba258354449501b771fd98e
2011-11-08 14:21:06 -08:00
Mike Lockwood
5e99dbc85c
Merge "Add support for disabling wallpaper service" into ics-aah
2011-11-08 14:13:27 -08:00
Mike Lockwood
1b12c7b361
Merge "PhoneWindowManager: stifle warning that ITelephony service does not exist" into ics-aah
2011-11-08 14:10:57 -08:00
Mike Lockwood
39114ab063
PhoneWindowManager: stifle warning that ITelephony service does not exist
...
Change-Id: I6df1a74cd3029c4c69362934e0d84213874af4c6
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-08 14:05:31 -08:00
Adam Powell
141bdb17dd
Fix the action bar menu layout to use the correct divider drawable.
...
Change-Id: I9f9fe8318cbad3cfe4e34a37204a6c82a2e9a0c6
2011-11-08 13:33:58 -08:00
Jake Hamby
fee5f29b22
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
2011-11-08 13:22:34 -08:00
Wei Huang
ea50748b54
Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
2011-11-08 13:16:02 -08:00
Jeff Sharkey
38ddeaa67e
Avoid inconsistent state when remove fails.
...
Bug: 5433432
Change-Id: Ia388fda006cbda09b5947fc61cec6353f75a3805
2011-11-08 13:04:22 -08:00
Brian Colonna
04217efb8e
Merge "Fix 5514230: preventing null window token from occurring" into ics-mr0
2011-11-08 12:51:36 -08:00
Matthew Xie
48542eb39e
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
2011-11-08 12:19:37 -08:00
Matthew Xie
ad2321027e
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
...
Give APP a way to find out if a service is supported by a remote device
bug 5487202
Change-Id: I5a2d050cf24d945e1c9875963c34177ed1ce773a
2011-11-08 11:58:12 -08:00
Dianne Hackborn
665e105f14
Merge "Cleanup remote execution of perf tests." into ics-mr1
2011-11-08 11:52:58 -08:00
Jean-Michel Trivi
4ba27fe702
Bug 5585323 New system permission for media decode
...
Add a system permission to enable the use of any installed
media decoder when decoding for playback (as opposed to transcode).
Change-Id: Ifb10a5fa8d5663a78ccbb5fa8266ad6535c234f2
2011-11-08 11:36:26 -08:00
Daniel Sandler
ce18b91c60
Add day of week.
...
Bug: 5581707
Change-Id: Ifa881e6a4a7a54599eb4567c2458d1df27b68a3e
2011-11-08 14:26:00 -05:00
Mike Lockwood
6026b825de
Merge "AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set." into ics-aah
2011-11-08 11:09:54 -08:00
The Android Open Source Project
6dee1a9d04
Reconcile with ics-mr0-release
...
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
2011-11-08 11:08:20 -08:00
Dianne Hackborn
dd13793a25
Cleanup remote execution of perf tests.
...
Change-Id: I0d00537194f3a70969220db16f57bda6f25e454b
2011-11-08 10:59:28 -08:00
Adam Cohen
75b2038004
Merge "Making default widget padding public API" into ics-mr1
2011-11-08 10:53:39 -08:00
Robert Greenwalt
a74ebb6d08
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-08 18:33:20 +00:00
Robert Greenwalt
604019c8d4
Merge "Fix build." into ics-mr1
2011-11-08 10:31:37 -08:00
Mike Lockwood
a2aa08e20c
AudioManager: transparently convert volume settings for other streams to master volume if config_useMasterVolume is set.
...
This allows Music2 and other media apps to control master volume without changing their code
Bug: 5567694
Change-Id: I48b6260b193b22c395be5a31cd1d270b2929a91e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-11-08 10:31:21 -08:00
Adam Powell
a7d41ece61
am 8689afbd: Merge "Fix bug 5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1
...
* commit '8689afbd63db3b1af6058709da843ea9d6433b21':
Fix bug 5544103 - Spinner text doesn't look dimmed when disabled
2011-11-08 18:28:23 +00:00