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

33193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
c4dfe3d5c0 am 92d29c66: am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread 
Merge commit '92d29c66f5cb69627172d21057e672eaba2eb03f'

* commit '92d29c66f5cb69627172d21057e672eaba2eb03f':
  Fix NPE if there is no accelerometer.
 2010-10-08 12:39:14 -07:00
Dianne Hackborn
a1b0d6966e resolved conflicts for merge of efa4f7f8 to master 
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
 2010-10-08 11:09:38 -07:00
Hung-ying Tyan
026284745b am 88b4bd5f: am fc7e7766: Merge "CallManager/SipPhone: fix reject a ringing call" into gingerbread 
Merge commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f'

* commit '88b4bd5f3e8d6e68541eec4a603b1df83291cf1f':
  CallManager/SipPhone: fix reject a ringing call
 2010-10-08 10:25:50 -07:00
Fred Quintana
c6a69559cb Add getCurrentSyncs() to the SDK, which replaces the deprecated 
getCurrentSync().

Change-Id: I1112df41e48ed93ff4c0c5af4825dbdce0c4cccc
 2010-10-08 09:50:45 -07:00
Gilles Debunne
fdcd2660ec Merge "resolved conflicts for merge of ba04dbc6 to master" 2010-10-08 09:20:57 -07:00
Daniel Sandler
e7aa07852d Merge "Start of input method control on system bar." 2010-10-08 08:14:12 -07:00
Daniel Sandler
a84a69f2eb Start of input method control on system bar. 
This change creates a new icon to the right of the
notification area for the IMM to expose control over the
current IME. Currently it shows the IME subtype picker.

TODO: Connect directly to the IMMService to show the correct
icon (and hide the icon entirely when the input panel is not
visible).

Bug: 2975425
Change-Id: If07f30867b81950a0a86b00807a41e2ff2af389c
 2010-10-08 10:39:46 -04:00
Patrick Scott
5fe721f5f5 Fix NPE in addMessageToConsole. 
CallbackProxy should always check for client during handleMessage.

Bug: 3060412
Change-Id: I0a84fa2ce21cc46d9b215b18a700119c7c12a7f2
 2010-10-08 10:06:07 -04:00
Shih-wei Liao
3ca506b6d4 Merge "Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already. Add #define guard for rs_types.rsh to prevent multiple inclusion." 2010-10-08 02:20:13 -07:00
satok
0ff647b030 Add a cancel button to InputMethodPicker and InputMethodSubtypePicker 
Change-Id: Ia64b9716c18da5a541c7fc04a507541d2ab952da
 2010-10-08 13:49:28 +09:00
Gilles Debunne
cf1e925aa1 resolved conflicts for merge of ba04dbc6 to master 
Change-Id: I175aa21ef01b98b0c3c46aea0b754d14984128b9
 2010-10-07 20:46:03 -07:00
satok
26b29d1b87 Merge "Show "more" button in the dialog of InputMethodSubtypePicker" 2010-10-07 19:48:43 -07:00
Robert Greenwalt
4c1a013472 Merge "Stop using unauthorized dns" 2010-10-07 18:56:14 -07:00
Shih-wei Liao
708e04ff41 Move rsDebug from rs_math.rsh to rs_core.rsh: rsDebug is more like core functionalities instead of math functionalities. Also portions of rsDebug implementation has been in rs_core.rsh already. 
Add #define guard for rs_types.rsh to prevent multiple inclusion.

Change-Id: I1db6dac9825c2618db3660e22c8791aff08d6243
 2010-10-07 18:21:32 -07:00
Brian Carlstrom
c4838afb34 Merge "Move LOG_ALWAYS_FATAL to end of app_process" 2010-10-07 16:32:02 -07:00
Romain Guy
ecd31740a0 Merge "Add 3D transforms support to all gradients." 2010-10-07 16:20:20 -07:00
Mike Lockwood
170bf59c7c Merge "MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty" 2010-10-07 16:15:33 -07:00
Brian Carlstrom
de6d1d889e Move LOG_ALWAYS_FATAL to end of app_process 
Since LOG_ALWAYS_FATAL is always fatal and code after it is by
definition unreachable, put the call after other diagnostic output.

Change-Id: Ib3a515a04125d8e4f6e8af3a6f59226e8f0dd9cd
 2010-10-07 16:02:11 -07:00
Robert Greenwalt
df255c2283 Stop using unauthorized dns 
We were using somebody elses dns without permission - rude.  Switch to using
secondary google public dns.

bug:3045768
Change-Id: I042262bb96d3efed4c0265dc7ff6ac418e4d4f1e
 2010-10-07 15:32:08 -07:00
Romain Guy
14830948d0 Add 3D transforms support to all gradients. 
Change-Id: I61409edd00dab3a11684a3f5e4f7df0afc734758
 2010-10-07 15:07:45 -07:00
Mike Lockwood
6458935331 MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty 
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-07 17:43:57 -04:00
Gil Dobjanschi
2409cdb587 Merge "Remove MediaVideoItem and AudioTrack playback APIs." 2010-10-07 14:13:21 -07:00
Gil Dobjanschi
b27f2d3126 Remove MediaVideoItem and AudioTrack playback APIs. 
Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
 2010-10-07 13:57:54 -07:00
Andreas Huber
d6e9d7695b Merge "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback." 2010-10-07 13:57:08 -07:00
Andreas Huber
08478d17a3 Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback. 
Change-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01
related-to-bug: 3051572
 2010-10-07 13:48:34 -07:00
Chet Haase
6a5fc4bc62 Merge "New TimeInterpolator interface for android.animation package." 2010-10-07 13:18:36 -07:00
Chet Haase
e0ee2e9f31 New TimeInterpolator interface for android.animation package. 
The new animation package's reliance on the old Interpolator interface (in
android.view.animation) was an eyesore. Adding TimeInterpolator, and having the
old Interpolator interface extend it, allows the new Animator classes to break
the tie to the older animation package completely. However, developers can still
use the older Interpolator-based classes, such as AccelerateInterpolator,
because they all implicitly extend the new TimeInterpolator class.

Change-Id: I41132fa56167ba564f4839113289114d0ea31a92
 2010-10-07 12:27:06 -07:00
Eric Laurent
786c57150c am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
 2010-10-07 12:23:39 -07:00
Adam Powell
1b93c0ab55 am ee7e0efc: (-s ours) am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 
Merge commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916'

* commit 'ee7e0efcc1314b994ba70d91f6e8fa951044c916':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
 2010-10-07 12:23:20 -07:00
Adam Powell
cd1093c267 am 65e8b476: am 5a5fff71: Fix bug 3064143 - remove default bold on buttons 
Merge commit '65e8b476245255a96faaa70872a4196763a95e10'

* commit '65e8b476245255a96faaa70872a4196763a95e10':
  Fix bug 3064143 - remove default bold on buttons
 2010-10-07 12:22:47 -07:00
Dianne Hackborn
8c4e779a4c am e112b744: am 930d6c3c: Merge "Fix issue #3056500: Problem report for ASTRO" into gingerbread 
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'

* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
  Fix issue #3056500: Problem report for ASTRO
 2010-10-07 12:22:14 -07:00
Joe Onorato
2cddeb4b82 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread 
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
 2010-10-07 12:22:03 -07:00
Andreas Huber
a458719bb6 am 56ee1080: am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out." into gingerbread 
Merge commit '56ee1080f004110bff622e5b60c243d9cabfe120'

* commit '56ee1080f004110bff622e5b60c243d9cabfe120':
  Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.
 2010-10-07 12:21:33 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
 2010-10-07 12:21:22 -07:00
Jeff Brown
928b5bfa7d am 56364bcd: am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread 
Merge commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7'

* commit '56364bcd0d1a1b064db3e83fdb64f948ce5c2ad7':
  Make secure views tolerate IME overlays.
 2010-10-07 12:20:45 -07:00
Kenny Root
13297fddcb am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread 
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
 2010-10-07 12:20:25 -07:00
Dianne Hackborn
ac3d43dd1c am 5d722580: (-s ours) am e02e41f4: Merge "DO NOT MERGE: Get rid of status bar\'s dim during night." into gingerbread 
Merge commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d'

* commit '5d722580afbca277ebc760d5b2c0400f4bca1a8d':
  DO NOT MERGE: Get rid of status bar's dim during night.
 2010-10-07 12:20:09 -07:00
Stephen Hines
b8f69ab7c6 Merge "Add RS testing for long and long long." 2010-10-07 11:42:13 -07:00
Stephen Hines
1d73e57a04 Add RS testing for long and long long. 
Change-Id: I42716b1a273c79103474b2e96441e7e3eac020b9
 2010-10-07 11:40:38 -07:00
James Dong
d5df1e5cfc Merge "Add two more options to "recordvideo" utility" 2010-10-07 11:00:25 -07:00
Mike Lockwood
058ad782e6 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
22f41918fa resolved conflicts for merge of 6327a9fe to master 
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
 2010-10-07 13:55:25 -04:00
Joe Onorato
7d56e3d3cb Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached." 2010-10-07 10:52:30 -07:00
Joe Onorato
c3f0b2d10e Merge "Don't crash if there is no phone app and someone presses the phone button." 2010-10-07 10:03:46 -07:00
Robert Greenwalt
8ece274da3 am b81b89f1: (-s ours) am 45a8901d: Merge "Add supporting MCC=450(Korea)" into gingerbread 
Merge commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6'

* commit 'b81b89f1bf8bd39e71f5209fe7ae80db3c100bb6':
  Add supporting MCC=450(Korea)
 2010-10-07 09:25:54 -07:00
Joe Onorato
d37870af20 Don't crash if there is no phone app and someone presses the phone button. 
The phone button probably doesn't exist on products without phone apps,
but the monkeys still know how to find it.

Change-Id: I36aca53506c8d7d7565df8674aff9d59745139e0
 2010-10-07 12:22:56 -04:00
James Dong
cf2bdd1fd8 Merge "0-memcpy video recording framework" 2010-10-07 08:11:26 -07:00
satok
7f35c8cc88 Show "more" button in the dialog of InputMethodSubtypePicker 
- Handle subtypes correctly in InputMethodPicker

Change-Id: I0ff9baec46724ca9dee2a7943fee69d4b204589e
 2010-10-07 23:59:18 +09:00
Kristian Monsen
b5c564fed2 Merge WebKit at r68651 : Update user agent string 
Change-Id: Ib48186532c9a6033f1fb107f1fc072cd4fe89820
 2010-10-07 11:17:12 +01:00
James Dong
769bb2aaa4 0-memcpy video recording framework 
Part II: proposed camera hal change

Change-Id: I51663cf5de2b00f71e4ff1828080094676065444
 2010-10-07 02:09:03 -07:00