60449 Commits

Author SHA1 Message Date
Dianne Hackborn
4bbd71a6b2 Merge "Fix issue #5228934: IME shows up on boot, or when digits screen is tapped" into ics-mr0 2011-10-21 11:03:34 -07:00
RoboErik
2b41c2f38c Merge "Color API comment updates." 2011-10-21 11:00:40 -07:00
Mangesh Ghiware
bb99e28cd6 Fix issue# 5492404: Reading level check thread error.
Remove access to WebSettings from getReadingLevelScale() by saving the
double-tap zoom scale factor in ZoomManager. WebSettings can only be
accessed in the UI thread.

Change-Id: Ic7289bf3c14d800797f2e85546a088a9071e0468
2011-10-21 10:53:29 -07:00
Mike Lockwood
6b6bfb1874 Merge "PowerManagerService: Enable light sensor debug output" into ics-mr0 2011-10-21 10:26:55 -07:00
Gilles Debunne
0499f90a2d Merge "Bug 5428541: Check that span is still in text before deleting" into ics-mr0 2011-10-21 09:48:07 -07:00
Eric Fischer
4e7ce9352b Merge "Import revised translations." into ics-mr0 2011-10-21 09:34:22 -07:00
Mike Lockwood
22d12ab14c PowerManagerService: Enable light sensor debug output
Bug: 5426212

Change-Id: I46ca01eee8d69f7bd6fc63e53506ba42c3fe537d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-10-21 09:05:05 -04:00
Kristian Monsen
43abfe1be2 Merge "WebView part of fix for bug 5307956" 2011-10-21 04:48:22 -07:00
Jake Hamby
a625e1fe10 Merge "Add wrapper classes for UICC service tables." 2011-10-21 00:49:41 -07:00
satok
48019c65ed am 2cf1cf09: Fix possible NPE
* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE
2011-10-20 23:35:27 -07:00
satok
2cf1cf0985 Fix possible NPE
Bug: 5494803
Change-Id: I6f9d0076405ab7c99076a1168198c2ee70ad5082
2011-10-21 15:25:23 +09:00
Romain Guy
79174b7528 Merge "Make sure 9patches are not filtered when not necessary Bug #5383406" 2011-10-20 20:33:51 -07:00
Romain Guy
5e7c469c7a Make sure 9patches are not filtered when not necessary
Bug #5383406

Change-Id: I061c8069a4d9f4eaf45671283710b564639eeb32
2011-10-20 20:33:07 -07:00
Winson Chung
22ca09595d Last update for screenshot animations for MR0. (Bug: 5333706)
- Also adding proper border asset

Change-Id: I423389d1a68498b2e470e6d483f5b7542a814c31
2011-10-20 19:47:08 -07:00
Fabrice Di Meglio
44cd3f8f3d Merge "Fix compilation issue when DEBUG_GLYPHS define is activated" 2011-10-20 18:58:03 -07:00
Dianne Hackborn
0836c7cb98 Fix issue #5228934: IME shows up on boot, or when digits screen is tapped
Activity aliases weren't propagating the softInputMode from the original
activity.

Change-Id: I47534e6c9a0f94bb6eb3fd2186ba9ffc8d583d08
2011-10-20 18:40:23 -07:00
Jake Hamby
4db49b33b8 Add wrapper classes for UICC service tables.
The USIM application on the UICC contains an EF for the USIM service table,
a byte array containing a bit field of available services on the USIM.

IccServiceTable is an abstract class to manage a byte array containing a
service table and map it to human-readable enum values defined in the
subclass, e.g. UsimServiceTable. The availability of a service can be
tested with isAvailable(), which is implemented in the subclass to take
an enum, e.g. UsimService, as a parameter, and passes the ordinal to the
generic isAvailable() in the parent. IccServiceTable also provides a
toString() method that returns a human-readable list of enabled services.

The ISIM application for IMS contains a similar ISIM service table.
This can be supported with a new IsimServiceTable class in the future.

Change-Id: I9c3134672ed306e297dd35d633235cffca510aad
2011-10-20 17:50:47 -07:00
Mathias Agopian
10b4503f2b am 16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0
* commit '16bece04bdbac9af5228436f70267ec5763315de':
  added dpi and refresh rate info in SF's dumpsys
2011-10-20 17:48:02 -07:00
Eric Fischer
3e04e6b48d Import revised translations.
Change-Id: I35861d5a5797cfe400d6e831d245f93263ca3df2
2011-10-20 17:46:00 -07:00
Mathias Agopian
16bece04bd Merge "added dpi and refresh rate info in SF's dumpsys" into ics-mr0 2011-10-20 17:45:55 -07:00
Jim Miller
dd579c3e92 am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0
* commit '6b0244485c1d20261cffb0fbabebdfefd701867e':
  Fix 5493266: Properly restore background after playing music
2011-10-20 17:35:51 -07:00
Jim Miller
6b0244485c Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 2011-10-20 17:33:42 -07:00
Mathias Agopian
abf88bead4 added dpi and refresh rate info in SF's dumpsys
Change-Id: I2327248eb1993689367e3daeaccba74c172dfceb
2011-10-20 17:22:38 -07:00
RoboErik
8a8eebcbe8 Color API comment updates.
Change-Id: I61c00089d0cd39e145126e709e46ba3441d49a2a
2011-10-20 17:13:29 -07:00
Jim Miller
2928c9d82b Fix 5493266: Properly restore background after playing music
KeyguardViewBase maintains the transparent background for all lock screen
views.  The background was being overwritten by the change to make lock
screen opaque when music was being shown.

Change-Id: Id1ab415f68746b20c9229fa58fef9ec8be354f01
2011-10-20 17:00:38 -07:00
Jake Hamby
df1f572e0b Merge "Add new RIL requests to support SIM data download via SMS over IMS." 2011-10-20 16:55:48 -07:00
Jake Hamby
094854091b Add new RIL requests to support SIM data download via SMS over IMS.
On an LTE device where incoming SMS messages over IMS are sent to
the framework via RIL_UNSOL_RESPONSE_NEW_SMS responses sent to
the RIL, it may be necessary to process USIM data download SM's
(message class 2). This requires the RIL to implement two new requests.

1) RIL_REQUEST_STK_SEND_ENVELOPE_WITH_STATUS:
   send an ENVELOPE command to the UICC, receiving the SW1 and SW2
   status bytes in addition to the command response.

2) RIL_REQUEST_SMS_ACKNOWLEDGE_WITH_PDU:
   send an RP-ACK or RP-ERROR acknowledgement to the incoming SM,
   including an acknowledgement PDU containing the envelope response.

Change-Id: If597a14fa8c4780c75da84fa96c49abcb05960f2
2011-10-20 16:31:28 -07:00
Adam Powell
53b5d17d08 am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0
* commit 'a5c371bf1fc878f84c296a63839a5d031dea843f':
  Bug 5275928 - Invasion of the monkeys
2011-10-20 16:26:56 -07:00
Adam Powell
a5c371bf1f Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 2011-10-20 16:25:04 -07:00
Iliyan Malchev
64ef6b47e0 add -ldl to host executables
This fixes the build on Linux when RefBase is compiled with reference tracking
enabled.

Change-Id: I3e931e0b463ce836f6fdb30c37068d77144631a3
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-10-20 16:21:25 -07:00
Gilles Debunne
592ddaa34f Bug 5428541: Check that span is still in text before deleting
This is a cherry-pick in MR0 of CL 141388 from master.

Bug 5488537

In case the span has been removed from the text since the popup
was showed, the delete action is a no-op.

Change-Id: Iec2aeaf03becd82ad44715d5c08bfaa8f62aa3fe
2011-10-20 16:03:04 -07:00
The Android Automerger
c8ebe7f82a merge in ics-mr0-release history after reset to ics-mr0 2011-10-20 15:49:44 -07:00
Michael Chan
63aa6622d0 Merge "Fix typos" 2011-10-20 15:42:30 -07:00
Adam Powell
97e1836e1b Bug 5275928 - Invasion of the monkeys
Fix a monkey bug where runnables set to open popup windows were being
left around.

Change-Id: I29f2c7763ab667c784b96b60ef0d7e04d358c4d9
2011-10-20 15:38:05 -07:00
Gilles Debunne
c5d6fe0152 Merge "Renaming of a hidden API: ShowSoftInputOnFocus" 2011-10-20 15:35:34 -07:00
Gilles Debunne
972b7d2c3b Merge "Typo in ViewRootImpl" 2011-10-20 15:35:20 -07:00
Gilles Debunne
f09c150232 Merge "Wrong word cut at end of lines with spaces" 2011-10-20 15:35:12 -07:00
Michael Chan
cf0ca99a22 Fix typos
Change-Id: I6406b33f52bd8fb126a9b346d1bfe30ca2c2144b
http://code.google.com/p/android/issues/detail?id=14614
http://code.google.com/p/android/issues/detail?id=3563
http://code.google.com/p/android/issues/detail?id=5960
2011-10-20 15:32:37 -07:00
Irfan Sheriff
995fe182f7 am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '2159927f366fd8a617128df60865923e131cad7b':
  Fix handling in DisconnectingState
2011-10-20 15:07:46 -07:00
Irfan Sheriff
2159927f36 Merge "Fix handling in DisconnectingState" into ics-mr0 2011-10-20 15:05:07 -07:00
Irfan Sheriff
2d57d860c2 Fix handling in DisconnectingState
Now that we also handle supplicant state change to identify that
a network is disconnected (in case CTRL-EVENT-DISCONNECTED goes missing),
it is dangerous to defer all supplicant state change messages
while in DisconnectingState.

It may happen that the CTRL-EVENT-DISCONNECTED goes missing while in
DisconnectingState resulting in a supplicant state change of 0 (disconnect)
getting deferred.

Eventually after a connection completes, the supplicant state change events
get handled and the state machine goes into DisconnectedState.

Fix by having state machine switch out of DisconnectingState once we
do not immediately see a CTRL-EVENT-DISCONNECTED state.

Bug: 5490789
Change-Id: Ia2263795e53c51da0a2bfeefecfeb6256d6c5267
2011-10-20 14:38:54 -07:00
Dirk Dougherty
fe14c2fccb am 957ad44e: Merge "Doc change: minor fixes to ICS highlights." into ics-mr0
* commit '957ad44e9c6f1415dae85a0177d37c3a69f1e955':
  Doc change: minor fixes to ICS highlights.
2011-10-20 14:34:50 -07:00
Dirk Dougherty
957ad44e9c Merge "Doc change: minor fixes to ICS highlights." into ics-mr0 2011-10-20 14:32:19 -07:00
Svetoslav Ganov
c8c2e17ecd Merge "Add content description setter to RemoteViews" 2011-10-20 14:29:18 -07:00
Dirk Dougherty
685ce06721 Doc change: minor fixes to ICS highlights.
Change-Id: I879ee08b9834fc911fb5055bb627a3e245b70d56
2011-10-20 14:20:36 -07:00
Jason Sams
79235d2a93 Merge "adding getters to Sampler ProgramRaster, ProgramStore, Element. Element adds ability to get subelement info. Tests for new stuff." 2011-10-20 13:54:37 -07:00
Jason Sams
5b6f23868a Merge "Remove ObjBaseRef from the hal struct" 2011-10-20 13:52:43 -07:00
Jason Sams
981d13291e Merge "Fixes and optimizations of two quaternion functions." 2011-10-20 13:49:59 -07:00
Peter Ng
002a71e146 Sharpening text edit assets
Change-Id: I72db9a1c8981169f3bea50bd3e72fadcc682cfe7
2011-10-20 13:32:54 -07:00
Christopher Tate
257e67e44c Merge "Don't inappropriately kill ANRing drop recipients" 2011-10-20 13:21:07 -07:00