61189 Commits

Author SHA1 Message Date
Tom Taylor
1366c756d2 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
f3a892ab93 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -08:00
The Android Automerger
b4f88de3c7 merge in ics-mr0-release history after reset to ics-mr0 2011-11-08 06:41:10 -08:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
2011-11-08 05:58:37 -08:00
Wu-cheng Li
b75783571b Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
ACTION_CAMERA_BUTTON is for camera hardware button. Change the
intent to INTENT_ACTION_STILL_IMAGE_CAMERA.

bug:5572158

Change-Id: I49ffbf50ecd4458065ee1c2d1fdab8d9e696a1a8
2011-11-08 21:19:34 +08:00
Narayan Kamath
98f5500c71 Merge "Fix a bug in the network TTS api." into ics-mr1 2011-11-08 02:09:18 -08:00
Gilles Debunne
39896f52a8 Merge "No more context menu in TextView" into ics-mr1 2011-11-08 00:48:27 -08:00
Chih-Chung Chang
713c9a331e Merge "Fix 5509346: Resize the thumbnails if it's too large." into ics-mr1 2011-11-07 22:59:55 -08:00
James Dong
ee7ebb3257 Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1 2011-11-07 22:57:02 -08:00
Matthew Xie
67f1ceb616 Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1 2011-11-07 22:42:00 -08:00
Mathias Agopian
a06c06b9c0 Fix an issue where we could wait for a non-existing transaction
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"

Note: the system would recover after a 5 second timeout.

Bug: 5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
2011-11-07 21:58:03 -08:00
Mathias Agopian
7f1c94e198 Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1 2011-11-07 21:33:53 -08:00
Mathias Agopian
eed2373321 SensorService now always clamps the requested rate
Requested rate will be clamped to the minimum rate and then
to 1ms. Previously we would return an error if a lower
rate was asked. The SensorManager documentation wording
allows this change.

We do this to get more consistancy between all the sensor
drivers / HALs

Change-Id: I199f76486fb76ccbb11e7280460a03726c767e84
2011-11-07 21:21:47 -08:00
Daniel Sandler
c06669a303 Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1 2011-11-07 19:47:51 -08:00
Jim Miller
1f56edc6cd Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen
Some carriers cannot process emergency calls when the IMSI is not available,
which happens when the SIM is locked.  This allows the behavior to be overwritten
in an overlay. When the config variable is set to 'false', the emergency
button no longer appears on the SIM or PUK unlock screens.

Change-Id: I3127bfd5e7ebfabea997fbe048cc474e48b7a81c
2011-11-07 19:00:48 -08:00
Svetoslav Ganov
698e1d5d86 NumberPicker incorectly enforcing minimal width and height.
The min width and height were enforced with an exception which
is not correct since a view not having enough space should not
terminate the application. Now the insufficient vertical or
horizontal space is propagated by setting the
MEASURED_STATE_TOO_SMALL flag and respecting the constraints
imposed while measuring (consistent with the rest of the View
hierarchy).

bug:5572237

Change-Id: I2dbeb5451d3426cc983b41f6023c7b0fc52c7da3
2011-11-07 18:49:25 -08:00
Dianne Hackborn
84b02130a9 Merge "Update perf tests to always run each test in a fresh process." into ics-mr1 2011-11-07 18:46:54 -08:00
bi4004.lee
141da403c0 Fix exception when sending multi-page SMS with Turkish characters.
- Precondition: config_sms_enabled_single_shift_tables is configured as
   1 (Turkish) in frameworks/base/core/res/res/values/config.xml

 - Cause: There is no consideration for National Language Shift Tables in
   SmsMessage::fragmentText function.

 - Solution: The header length is calculated properly according to
   National Language Shift Table

 - modified to add test cases and fix calculation bug (jhamby@google.com)

Bug: 5553544
Change-Id: I9eaefbbd6b3d75f8c41cbf9d0cb03a701cfa1cb3
2011-11-07 18:03:45 -08:00
Adam Cohen
4c96a59b43 Making default widget padding public API
Change-Id: Ibf4f5dc1a36d84be1acc3ccdc4330276f82aa303
2011-11-07 17:59:23 -08:00
Adam Powell
13194b16d0 Merge "Fix bug 5534414 - Unselected tab states for Holo" into ics-mr1 2011-11-07 17:55:17 -08:00
Adam Powell
d1a956b5f9 Fix bug 5534414 - Unselected tab states for Holo
Sync unselected action bar tab states with UX. Unselected states no
longer have an underline.

Leave TabWidget tabs alone; they still keep the underline for
unselected tabs.

Change-Id: I379b94aeabb9472f3b6c859507faea57f2f9b0b6
2011-11-07 17:44:22 -08:00
John Reck
aefc28a1b6 Remove unnecessary memory allocations
Bug: 5581637
 Also delete some dead, unused code

Change-Id: If6efd11f5032141dadbfcd0b3215e89b464e5f35
2011-11-07 17:42:06 -08:00
Dave Santoro
003924c37a Unhide social stream APIs for Contacts.
Bug 5569021

Change-Id: Iba6ad0fb8d1bd4eafd9fbb42c28a332679ade11c
2011-11-07 17:06:54 -08:00
John Wang
2f99bb5e4f Merge "Remain in call audio mode while phone is offhook." into ics-mr1 2011-11-07 16:46:11 -08:00
John Wang
f885e87884 Remain in call audio mode while phone is offhook.
While offhook, even the call is on hold, setAudioMode() remains in
MODE_IN_CALL (or MODE_IN_COMMUNICATION for SIP) rather than
switching back to NORMAL.

bug:5546901
Change-Id: I0189dc010d1109895cc38e17b1b80418445d514a
2011-11-07 15:45:18 -08:00
Robert Greenwalt
2d9ccdb4ab am b445362b: Make upstream tether list threadsafe
* commit 'b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
  Make upstream tether list threadsafe
2011-11-07 23:36:28 +00:00
John Reck
669e1f80a7 Merge "Remove nativeRecordButtons" into ics-mr1 2011-11-07 15:20:38 -08:00
Adam Powell
b1dbf8e605 Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1 2011-11-07 14:56:36 -08:00
tk.mun
148c7d0de7 Wimax : wimax framework related open source.
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167
2011-11-07 14:47:40 -08:00
Dianne Hackborn
6b57b7e4d5 Update perf tests to always run each test in a fresh process.
Also some new classes to preload.

Change-Id: Ia2b5f856eaee533b9603b533ebaf8cb55e2ac193
2011-11-07 14:45:49 -08:00
Robert Greenwalt
b445362bd6 Make upstream tether list threadsafe
Outsiders asking for this list may cause the list to change on another thread.
Fixing general synchronization issues.

bug:5531630
Change-Id: I7a3ee0bba3db40f45bcb0159491942fa4cf38c37
2011-11-07 14:44:48 -08:00
Peter Ng
e1aacdfe26 Merge "Added focused state to quickcontacts shortcut" into ics-mr1 2011-11-07 14:37:31 -08:00
Jim Miller
4d8ecc65c5 Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1 2011-11-07 14:24:43 -08:00
Tom Taylor
03da2f00aa Add new secure setting for controlling Messaging notifications
Bug 5552615
We're adding a new intent to allow 3rd party apps to disable
the Messaging app's notification. We want any app to be able to query
the setting of whether sms notifications are on or off, but only allow
system apps, particularly the Messaging app, to change that setting.
Other apps can change the setting by firing off an intent which brings
up a dialog activity in the Messaging app that'll let them turn off
Messaging notifications.

Change-Id: I4d2721191b86010efb383a24c28d911496440657
2011-11-07 14:16:44 -08:00
Daniel Sandler
989b9f2100 Fix scaling on notification panel wifi/battery icons.
Still needs a redesign.

Bug: 5544770
Change-Id: I27f6ea9f788110d7027b3ea788ca98216fa4fe28
2011-11-07 17:09:57 -05:00
John Reck
99f7b7b7b2 Remove nativeRecordButtons
Bug: 5572238
 Bug: 5558699

Change-Id: I8e275849f4f04c094a93528dd1fb59683d30e9cc
2011-11-07 14:00:05 -08:00
Peter Ng
d52ec9f3c2 Added focused state to quickcontacts shortcut
Bug: 5566627
Change-Id: I559660d71fa571d9201f99dbf76befa8b3276d9e
2011-11-07 13:55:29 -08:00
Adam Powell
78fed9b78f Change the "start deferred" fragment API to "user visible hint"
Allow a fragment to set a hint of whether or not it is currently user
visible. This will be used implicitly to defer the start of fragments
that are not user visible until the loaders for visible fragments have
run. This hint defaults to true.

Change-Id: Id1349d319886a277ef07301f64f7b9e12c8729bf
2011-11-07 13:47:13 -08:00
Peter Ng
a50c859d3f Merge "Color balancing framework assets" into ics-mr1 2011-11-07 13:40:45 -08:00
Peter Ng
4f4882ad12 Color balancing framework assets
-btns are more opaque
-toggle buttons are now blue
-spinners have better antialiasing
-quick contacts have a thicker divider
-switches are flipped

Bug:5560030
Change-Id: I28f64aa2be6c7f0d8c82e9b7c318aaf2bfd98ea7
2011-11-07 13:16:36 -08:00
Danielle Millett
044a0a7644 Showing a congratulations screen after choosing face unlock backup lock
Once a backup lock has been chosen, it sends an intent to show a
congratulations screen.  The moveTempGallery function has been moved
inside this new activity so it is no longer needed in LockPatternUtils.

Change-Id: I66868e6e3391b8b740f618fe633047ce388f55ca
2011-11-07 15:42:12 -05:00
Eric Fischer
08be43a6d9 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:36:02 -08:00
Eric Fischer
2f6172e35a Import revised translations. DO NOT MERGE
Change-Id: Ib095d85d01ffce5201d1e91d7c90c516f8c4c89c
2011-11-07 12:34:57 -08:00
Amith Yamasani
7919bfb123 Merge "Don't show the submit button when it isn't enabled." into ics-mr1 2011-11-07 10:57:17 -08:00
Brian Colonna
6233fbe5da Fix 5514230: preventing null window token from occurring
Sometimes the lockscreen view is recreated even though it has already
been created (and therefore Face Unlock is already running).  One
example of this is when the lockscreen momentarily displays in
landscape mode and then corrects itself into portrait mode.

When lockscreen recreates itself, it removes the view and then later
re-adds the view.  During that time the window token is null and may
be passed to Face Unlock when it tries to restart.  The reason this
doesn't happen *every* time the view is recreated is because the
onServiceConnected() callback starts Face Unlock, and usually it
runs after the view is re-added, but sometimes it runs before the view
is re-added, resulting in this bug.

An earlier fix put null-token checking inside of the Face Unlock
service, which prevented crashing but Face Unlock was still unable
to run.  This fix makes the null token case not happen so Face Unlock
can run every time.  It accomplishes this by simply not restarting
Face Unlock until the view has been re-added.

This fix also replaces checking two flags everywhere to see if
Face Unlock is being used and instead uses a single function call.

Change-Id: Ib46f25f2a58ab2e70470337861c25ee81a858873
2011-11-07 13:53:31 -05:00
Jamie Gennis
9cf8b6eadb EGL: use an in-memory the blob cache
This change makes the makes the stub EGL_ANDROID_blob_cache callbacks
actually use a BlobCache object.

Bug: 5474671
Change-Id: I5cbaae2dea3aad2fe306c9f57029c3f215a0863a
2011-11-07 10:48:42 -08:00
Winson Chung
19c86cacb2 Merge "Fixing screenshot border asset." into ics-mr1 2011-11-07 10:20:37 -08:00
Daniel Sandler
010bb273a5 Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
  Offer the user an option to launch Dreams when docked.
  Teach UiModeMgr about high-end and low-end desk docks.
2011-11-07 10:11:52 -08:00