drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
63,228 Commits 1 Branch 0 Tags
Commit Graph

63228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
71f6b7a679 SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED 
Change-Id: I9785f34eb913743054afc82d9ad4e75425f80899
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-21 13:33:28 -04:00
Mike Lockwood
34cf0c27cb Load lockscreen.disabled setting on database create as well as upgrade 
Change-Id: I3caae02373667b1fe6701c15195913df8971210e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-21 13:32:40 -04:00
Mike Lockwood
cfea6a1c5e SystemUI: Log an error instead of throwing an exception if navigation bar is enabled in tablet UI 
Change-Id: I09428abb717cd08765bfb5798b7214e91308ec8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-21 13:31:22 -04: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
f7f5f3075d am a625e1fe: Merge "Add wrapper classes for UICC service tables." 
* commit 'a625e1fe108d7e81dfd1b39d8a1cbdc53457721d':
  Add wrapper classes for UICC service tables.
 2011-10-21 00:53:46 -07:00
Jake Hamby
a625e1fe10 Merge "Add wrapper classes for UICC service tables." 2011-10-21 00:49:41 -07:00
satok
d7f4f83667 am 48019c65: am 2cf1cf09: Fix possible NPE 
* commit '48019c65edb6ab8be8da6bfebe532a89bbf62c4f':
  Fix possible NPE
 2011-10-20 23:37:39 -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
fd2068089f am 79174b75: Merge "Make sure 9patches are not filtered when not necessary Bug #5383406" 
* commit '79174b75285e4ece7b7f736fb1b6091f35b98d95':
  Make sure 9patches are not filtered when not necessary Bug #5383406
 2011-10-20 20:36:05 -07: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
f7aa197728 am 44cd3f8f: Merge "Fix compilation issue when DEBUG_GLYPHS define is activated" 
* commit '44cd3f8f3daf45f85f6e977dcf28f75287fbb25b':
  Fix compilation issue when DEBUG_GLYPHS define is activated
 2011-10-20 19:02:46 -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
d2c2edf0b5 am 10b4503f: am 16bece04: Merge "added dpi and refresh rate info in SF\'s dumpsys" into ics-mr0 
* commit '10b4503f2b3c3ad365a7adc73095a3280fc6bdfb':
  added dpi and refresh rate info in SF's dumpsys
 2011-10-20 17:50:06 -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
bd107a8b31 am dd579c3e: am 6b024448: Merge "Fix 5493266: Properly restore background after playing music" into ics-mr0 
* commit 'dd579c3e9272bbb348cc368e27e9adf64bb3f9ad':
  Fix 5493266: Properly restore background after playing music
 2011-10-20 17:37:52 -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
28471700b9 am df1f572e: Merge "Add new RIL requests to support SIM data download via SMS over IMS." 
* commit 'df1f572e0be1d3fd6cc34e1998ca5f82e0760410':
  Add new RIL requests to support SIM data download via SMS over IMS.
 2011-10-20 16:57:31 -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
Mike Lockwood
d218f2350e Merge "SettingsProvider: Add support for overriding lockscreen.disabled default value" into ics-aah 2011-10-20 16:37:53 -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
473cc87e8e am 53b5d17d: am a5c371bf: Merge "Bug 5275928 - Invasion of the monkeys" into ics-mr0 
* commit '53b5d17d08fa1d5fc63a9345691bf151a892fcaa':
  Bug 5275928 - Invasion of the monkeys
 2011-10-20 16:29:06 -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
Iliyan Malchev
9c782794ef am 64ef6b47: add -ldl to host executables 
* commit '64ef6b47e020da5370af8897638a0a778fa52b74':
  add -ldl to host executables
 2011-10-20 16:25:18 -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
72d22a9a9d am 63aa6622: Merge "Fix typos" 
* commit '63aa6622d0eb6592a582ac28078404bfc411bcef':
  Fix typos
 2011-10-20 15:44:58 -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
fc2fccc011 am c5d6fe01: Merge "Renaming of a hidden API: ShowSoftInputOnFocus" 
* commit 'c5d6fe015201b6522d0edf6b9c243ffa689744bf':
  Renaming of a hidden API: ShowSoftInputOnFocus
 2011-10-20 15:37:12 -07:00
Gilles Debunne
a086a49384 am 972b7d2c: Merge "Typo in ViewRootImpl" 
* commit '972b7d2c3bbb54a61a505d9d78927a158356ffb6':
  Typo in ViewRootImpl
 2011-10-20 15:37:10 -07:00
Gilles Debunne
27b359711d am f09c1502: Merge "Wrong word cut at end of lines with spaces" 
* commit 'f09c150232e79ffed43625f99ebc29003f6f11f4':
  Wrong word cut at end of lines with spaces
 2011-10-20 15:37:08 -07:00