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

35183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
a784d4ed25 Do not create drm directory here. Fix for bug 3134576. 
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
 2010-10-26 12:11:55 -07:00
Xavier Ducrohet
a44a5e02d2 am 1b6180ec: Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:10:28 -07:00
Jeff Hamilton
68a5c9f3cf Add a way to get a string for an error code. 
Change-Id: I133e974c656eb558349cbc3f9a2caf5b18c8fc3d
 2010-10-26 14:09:48 -05:00
Xavier Ducrohet
1b6180ec31 Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread 2010-10-26 12:09:18 -07:00
James Dong
ee1dc6221f Merge "Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java" 2010-10-26 12:01:39 -07:00
Gil Dobjanschi
fa3d263131 Removed the start and end transition types. 
Change-Id: I0c3f9f82a90e0835f550b11c5f1ea8a1147535a4
 2010-10-26 11:53:24 -07:00
Gil Dobjanschi
23617befe4 Merge "Effects and overlays are not modified when a video clip is trimmed." 2010-10-26 11:50:04 -07:00
Jaikumar Ganesh
7d0f553852 Merge "Fix A2DP connection problem, if disconnected while playing music." 2010-10-26 11:31:44 -07:00
James Dong
a0cab99dd2 Remove unused and hidden setVideoEncoderLevel() from MediaRecorder.java 
Change-Id: Ia464d79d65e43c84937624c5a6fa77c7155cffaa
 2010-10-26 11:30:42 -07:00
Patrick Scott
bb8300e155 Merge "Fix debug statements and aapt assert." 2010-10-26 11:26:19 -07:00
Jaikumar Ganesh
b2ec4fa8d7 Fix A2DP connection problem, if disconnected while playing music. 
Change-Id: I594564c11dc1698f00f9db3e6f6e4f8da9e2fe69
 2010-10-26 11:22:48 -07:00
Dianne Hackborn
78098341f8 Merge "Fix issue #3130426: Finsky crash in switching from window carousel" 2010-10-26 11:20:06 -07:00
Gilles Debunne
5b78d8a886 Merge "New Holo style for Tabs." 2010-10-26 11:18:51 -07:00
Xavier Ducrohet
25e96ce7b9 Fix rendering of digitalClock/Gallery in Eclipse editors. 
Change-Id: I80f4f90b173529632eaf2fbc3bb5471b7ede8216
 2010-10-26 11:18:39 -07:00
Dianne Hackborn
fb3cffeb35 Fix issue #3130426: Finsky crash in switching from window carousel 
Need to note that we no longer have saved state before delivering
results or new intents to an activity.

Also do some work on loaders to prevent apps from making fragment
changes as a result of receiving loader data.  This makes apps
consistent crash in a case that they would previously sometimes
crash (if they got the loader data after onPause).

Change-Id: I46e9e46d0aa05d9d7d6a275a2a488a18a20a5747
 2010-10-26 11:09:54 -07:00
Gilles Debunne
44c1473c03 New Holo style for Tabs. 
Holo theme with new assets and style for TabWidgets.

Legacy Themes still use GB style.

Assets added in a previous bluk update were removed.

Change-Id: Ia4a612678561fa5047bbd2a72488086c0f3d61a1
 2010-10-26 11:08:05 -07:00
Irfan Sheriff
f235c5ab91 add wps pin from device capability 
Bug: 3119043
Bug: 3112178
Change-Id: Iaae6bcf53e11f7fac82b3c604ddc27ff05e00542
 2010-10-26 10:48:11 -07:00
Patrick Scott
4f145c9674 Fix debug statements and aapt assert. 
ENABLE_PSEUDOLOCALIZE seems to not exist.

Change-Id: Ifef771a96938c7ff0f8b664142bb502030b8c543
 2010-10-26 13:22:17 -04:00
Shimeng (Simon) Wang
48c9daac20 Merge "Fix the viewport height to view height when title bar is visible." 2010-10-26 10:05:20 -07:00
James Dong
028b537051 Merge "Add two creation flags to OMXCodec::Create()" 2010-10-26 09:26:24 -07:00
Justin Ho
467fc41b06 am cc8de576: (-s ours) am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:13:08 -07:00
Justin Ho
cc8de576cd am 5a147d08: Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:11:12 -07:00
Justin Ho
5a147d083c Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread 2010-10-26 09:09:22 -07:00
Justin Ho
34952c0121 DO NOT MERGE - Fixing capitalized ringtone metadata only 
Change-Id: Ib16ca195356b6cbb3d3926f6d5a3de366eaa980e
 2010-10-26 09:05:06 -07:00
Mike Lockwood
1ebe049acc am 1b571bd3: am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:38:51 -07:00
Mike Lockwood
1b571bd3e9 am 1d28a840: Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:36:24 -07:00
Mike Lockwood
1d28a84059 Merge "Location Manager: Fix LocationManager.getBestProvider filtering." into gingerbread 2010-10-26 08:34:32 -07:00
Eric Laurent
977d362251 am ecae8a43: am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:17:07 -07:00
Eric Laurent
ecae8a43b7 am 1a58d9c3: Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:14:48 -07:00
Eric Laurent
1a58d9c398 Merge "Partial fix for issue 3124895." into gingerbread 2010-10-26 08:13:32 -07:00
Ben Murdoch
b9aa1d9d60 Merge "Update WebView useragent string for merge to WebKit r70209" 2010-10-26 07:44:34 -07:00
Gil Dobjanschi
ce03445c32 Effects and overlays are not modified when a video clip is trimmed. 
Change-Id: Ib9a54ecab4ea253caa6c64204493fc3f40a6aa53
 2010-10-26 07:44:00 -07:00
Jeff Hamilton
858825c54d am 6a49bff5: am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:28:57 -07:00
Joe Onorato
e7bc4f5e45 am a1e74744: am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:28:51 -07:00
Jeff Hamilton
6a49bff569 am 79fb6449: Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:24:57 -07:00
Joe Onorato
a1e7474498 am 11e2e9b0: Merge "Don\'t turn the button backlights on if the screen is off. Part 2." into gingerbread 2010-10-26 07:24:41 -07:00
Ben Murdoch
566440cf3d Update WebView useragent string for merge to WebKit r70209 
Change-Id: I127d530ca027509cd4570f508ce98bc03ddb6a68
 2010-10-26 15:23:30 +01:00
Jeff Hamilton
79fb6449a1 Merge "Make some contructors public but hidden." into gingerbread 2010-10-26 07:16:47 -07:00
Mike Lockwood
9e3191d16c Location Manager: Fix LocationManager.getBestProvider filtering. 
getBestProvider should only return location providers that the client
has permission to use.

BUG: 3124614

Change-Id: I065091d0445092563bc53fb4f7d93a1ab6bebb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-26 10:01:55 -04:00
Chet Haase
dcaff67a80 Merge "DisplayList optimizations and fixes." 2010-10-26 06:59:19 -07:00
Jeff Hamilton
d6c052a8ec Make some contructors public but hidden. 
This allows them to be used from within the
NFC stack process internally.

Change-Id: I7f81759da63d451efe86550a57a400fb224b2064
 2010-10-26 08:59:18 -05:00
Chet Haase
d98aa2de9a DisplayList optimizations and fixes. 
We now use a copy of SkPaint objects to avoid having it changed from under us.
We reuse copies that have not changed. We also copy the SkMatrix every time to
avoid the same problem.

Change-Id: If3fd80698f2d43ea16d23302063e0fd8d0549027
 2010-10-26 06:54:55 -07:00
Gloria Wang
7f266f089e A temporary fix for "Waiting for service drm.drmManager". 
Change-Id: I554c9bbec8c63c3c8dbc5b5374614c1101f6d1d9
 2010-10-26 03:31:13 -07:00
Jaikumar Ganesh
de9878d44f Merge "Add logs to debug incoming A2DP connection issue." 2010-10-26 00:32:06 -07:00
Jaikumar Ganesh
8febf88618 Add logs to debug incoming A2DP connection issue. 
Change-Id: Ifbdd625ec8dc50544990a1ddbd87284285f3f2d2
 2010-10-26 00:28:39 -07:00
Jaikumar Ganesh
e8b7f399f1 Merge "Clean up some logging to make it more useful to debug." 2010-10-26 00:18:31 -07:00
Jaikumar Ganesh
b1ef244732 Clean up some logging to make it more useful to debug. 
Change-Id: Ic30210ea6886b1c4630d7671a4b01736512e9da8
 2010-10-26 00:15:45 -07:00
Jim Miller
3ce0b7cd2d Merge "Fix 3117937: Add simplified "recent apps"." 2010-10-25 20:33:48 -07:00
Eric Laurent
164a8f86c7 Partial fix for issue 3124895. 
When a SIP call is put on hold and no other call is active, the audio mode should not be
switched to incall.

Change-Id: I1307330f10cbfb9c4223bcb9dc4faa79778750af
 2010-10-25 19:45:39 -07:00
Jaikumar Ganesh
bac9c29437 Merge "Implement ACTION_CONNECTION_STATE_CHANGED intent." 2010-10-25 19:41:57 -07:00