32119 Commits

Author SHA1 Message Date
Steve Block
fe06c42b61 Merge "Remove superfluous Ahem.tff" 2010-09-24 03:32:14 -07:00
satok
407b82a8e0 am abdbb5c1: am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d'

* commit 'abdbb5c1e5144e11d72367f79816caaa1dc63f8d':
  Use MOTOYA font for Japanese font
2010-09-24 01:41:50 -07:00
satok
abdbb5c1e5 am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982' into gingerbread-plus-aosp

* commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982':
  Use MOTOYA font for Japanese font
2010-09-24 01:37:39 -07:00
satok
933fc94ce1 Merge "Use MOTOYA font for Japanese font" into gingerbread 2010-09-24 01:33:23 -07:00
Hung-ying Tyan
a97c5f7779 Merge "fix build" 2010-09-23 23:24:35 -07:00
Hung-ying Tyan
fb0264096e fix build
Change-Id: Iff05b5ea7f535f532eec2af1edf78fdf8acfa21c
2010-09-24 14:23:31 +08:00
Chia-chi Yeh
50d9f32506 am 33460d83: am 658bec95: SDP: remove dead code.
Merge commit '33460d836fc2a062290d72ebcfb73af51ffa9c36'

* commit '33460d836fc2a062290d72ebcfb73af51ffa9c36':
  SDP: remove dead code.
2010-09-23 22:50:10 -07:00
Hung-ying Tyan
22a62d1342 resolved conflicts for merge of ee813bae to master
Change-Id: I84ca961fb18b29313b5ec6041a79ca87a1a1cd68
2010-09-24 13:45:43 +08:00
Mathias Agopian
2184624db1 am 4eb1ad5e: am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread
Merge commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e'

* commit '4eb1ad5e98c7b36f7ac4ec8c3270f9763afd107e':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
2010-09-23 21:41:30 -07:00
Steve Howard
04e79051dc am 56d60903: am a7bfe6ad: Support "seascape" rotation for "landscape-only" apps
Merge commit '56d6090380027efc7910537a2c2b99097ca36778'

* commit '56d6090380027efc7910537a2c2b99097ca36778':
  Support "seascape" rotation for "landscape-only" apps
2010-09-23 21:40:48 -07:00
Joe Onorato
77cf6f29f9 am 982c07e9: am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit '982c07e908c4cb66db224ccfd0810bf8bd449835'

* commit '982c07e908c4cb66db224ccfd0810bf8bd449835':
  Crash apps when they provide bad notifications instead of crashing the system process.
2010-09-23 21:40:24 -07:00
Chung-yih Wang
01a411326e am 1e2df14a: am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit '1e2df14a85f098d63b618531db733a21429d4037'

* commit '1e2df14a85f098d63b618531db733a21429d4037':
  Handle OPTIONS requests from SIP servers.
2010-09-23 21:39:49 -07:00
Dianne Hackborn
0eb74130ac Merge "resolved conflicts for merge of 8952a448 to master" 2010-09-23 21:28:38 -07:00
Dianne Hackborn
846df9f517 resolved conflicts for merge of 8952a448 to master
Change-Id: I9c752a5d10ae8d8e5ead1243b6abd4795204fc0b
2010-09-23 20:33:19 -07:00
Mike Lockwood
dbaa3c8f68 Merge changes Ie8bd9107,I1065179a
* changes:
  MTP: Reenable GetObjectPropValue and SetObjectPropValue
  MTP: Minor debug output cleanup
2010-09-23 20:09:46 -07:00
Mike Lockwood
d3bfecb0c9 MTP: Reenable GetObjectPropValue and SetObjectPropValue
Windows no longer chokes now that we implement the minimum set of properties

BUG: 2869730

Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 23:04:28 -04:00
Mike Lockwood
9f67924862 MTP: Minor debug output cleanup
Change-Id: I1065179aa64f43c7d8067ccda249319a016840ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:32:05 -04:00
Chia-chi Yeh
33460d836f am 658bec95: SDP: remove dead code.
Merge commit '658bec956785e074edc4f6c9fe739c366e37be33' into gingerbread-plus-aosp

* commit '658bec956785e074edc4f6c9fe739c366e37be33':
  SDP: remove dead code.
2010-09-23 19:22:12 -07:00
Chia-chi Yeh
658bec9567 SDP: remove dead code.
Change-Id: I2a5764a2b9cabc54b0ac18666e494c1cb39c4e9b
2010-09-24 10:17:42 +08:00
Mike Lockwood
2c2d06da2a Merge changes I75c4c7dc,Ie9f3dea3
* changes:
  MTP: List all the formats we support in addition to FORMAT_UNDEFINED
  MTP: Fix problems with signed ints in MtpCursor.cpp
2010-09-23 19:11:21 -07:00
Hung-ying Tyan
ee813baee4 am 84a357bb: Refactoring SIP classes to get ready for API review.
Merge commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c' into gingerbread-plus-aosp

* commit '84a357bb6a8005e1c5e924e96a8ecf310e77c47c':
  Refactoring SIP classes to get ready for API review.
2010-09-23 19:10:49 -07:00
Mike Lockwood
12b8a99fc1 MTP: List all the formats we support in addition to FORMAT_UNDEFINED
Fixes Windows Media Player support

BUG: 3003770

Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:08:24 -04:00
Mike Lockwood
ba7655432c MTP: Fix problems with signed ints in MtpCursor.cpp
BUG: 2978335

Change-Id: Ie9f3dea3b88b00a555e1ca3232f196e83ee7a6da
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-23 22:08:16 -04:00
Hung-ying Tyan
84a357bb6a Refactoring SIP classes to get ready for API review.
+ replace SipAudioCall and its Listener interfaces with real implementations,
  + remove SipAudioCallImpl.java, most of it is has become part of SipAudioCall,
+ add SipSession and its Listener classes to wrap ISipSession and ISipSessionListener,
+ move SipSessionState to SipSession.State,
+ make SipManager keep context and remove the context argument from many methods of its,
+ rename SipManager.getInstance() to newInstance(),
+ rename constant names for action strings and extra keys to follow conventions,
+ set thread names for debugging purpose.

Change-Id: Ie1790dc0e8f49c06c7fc80d33fec0f673a9c3044
2010-09-24 10:06:59 +08:00
Stephen Hines
bbc529244d Adding support for dynamically updated test status
Change-Id: If67de45f7fbf3ecaf4c6e85ed8dded0099e543fd
2010-09-23 19:02:42 -07:00
Mathias Agopian
fea28c9367 Merge "dump HWC state in dumpsys" 2010-09-23 18:19:46 -07:00
Mathias Agopian
4eb1ad5e98 am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread
Merge commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f' into gingerbread-plus-aosp

* commit '524a6d8e9bb4df9cec0520ac1d9733642b13e76f':
  better fix for [3028370] GL get error should return a valid error if no context is bound.
2010-09-23 18:17:08 -07:00
Mathias Agopian
524a6d8e9b Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread 2010-09-23 18:14:44 -07:00
Mathias Agopian
90da4dd2a2 dump HWC state in dumpsys
Change-Id: Ifbb38ca1ac9685776250e01c8d02021b35af72cf
2010-09-23 18:13:21 -07:00
James Dong
2e87f7b707 Added two more video encoders
Change-Id: Ia426da5bfc255974d7bbf3915a473543e0841dc9
2010-09-23 18:02:55 -07:00
Steve Howard
56d6090380 am a7bfe6ad: Support "seascape" rotation for "landscape-only" apps
Merge commit 'a7bfe6ad763208942d74a15933e2de1a3e06eba0' into gingerbread-plus-aosp

* commit 'a7bfe6ad763208942d74a15933e2de1a3e06eba0':
  Support "seascape" rotation for "landscape-only" apps
2010-09-23 17:52:28 -07:00
Steve Howard
a7bfe6ad76 Support "seascape" rotation for "landscape-only" apps
Change-Id: Ibbbd850dc2bfb741b39c04c982fbdd98f3fa4a67
2010-09-23 17:46:41 -07:00
Joe Onorato
dd92b611ad Merge "Merge commit '00cb6417' into master. Doesn't turn on the debugging." 2010-09-23 17:22:43 -07:00
Jim Miller
3060421045 Add new WaveView widget to framework and integrate into LockScreen.
This adds a new "Energy Wave" widget to the internal widgets and
integrates it into LockScreen.

ValueAnimator needed a slight modification since it expects to
be run inside of Activities with a Looper. Additionally, this adds
an API, removeAllUpdateListeners(), which is needed to properly
recycle ValueAnimator objects.

Some minor code cleanup and UI tweaks after review.

Changed delay timeout from 1.3s to 0.5s.

Change-Id: Ibcf015e61fa8ba79d62f2019f1b29ace7caa00c8
2010-09-23 17:14:48 -07:00
Joe Onorato
1578f21dad Merge commit '00cb6417' into master. Doesn't turn on the debugging.
Change-Id: I1d4db9c5256ba45a44e50e8229b895e2e5330690
2010-09-23 17:05:09 -07:00
Joe Onorato
982c07e908 am cbb7b05e: Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread
Merge commit 'cbb7b05e35368b104c27089f5f16640680f567c2' into gingerbread-plus-aosp

* commit 'cbb7b05e35368b104c27089f5f16640680f567c2':
  Crash apps when they provide bad notifications instead of crashing the system process.
2010-09-23 16:55:22 -07:00
Joe Onorato
cbb7b05e35 Merge "Crash apps when they provide bad notifications instead of crashing the system process." into gingerbread 2010-09-23 16:52:28 -07:00
Joe Onorato
eaa0718780 Crash apps when they provide bad notifications instead of crashing the system process.
Bug: 2958415
Change-Id: I9cbef340fb20a64eca8493950b814399c26ce197
2010-09-23 16:49:20 -07:00
Mathias Agopian
25b388c43b better fix for [3028370] GL get error should return a valid error if no context is bound.
it turns out that we cannot return INVALID_OPERATION from glGetError() because the
GL spec says that it must be called in a loop until it returns GL_NO_ERROR.

now, we always return 0 from GL functions called from a thread with no
context bound. This means that glGetError() will return NO_ERROR in this case,
which is better than returning a random value (which could trap the app in a loop).

if this happens in the main thread of a process, we LOG an error message once.

Change-Id: Id59620e675a890286ef62a257c02b06e0fdcaf69
2010-09-23 16:44:48 -07:00
Stephen Hines
4f5388df7f Merge "Add RsList implementation to RSTest." 2010-09-23 16:43:36 -07:00
Robert Greenwalt
8dcc28be06 Move long Connectivity tasks to handler thread.
Reduce ANR potential.
bug:2942829

Change-Id: I21610b462d5ab91821015cd16eecd86d2c0580d1
2010-09-23 16:43:21 -07:00
Chung-yih Wang
1e2df14a85 am f43ac911: Merge "Handle OPTIONS requests from SIP servers." into gingerbread
Merge commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53' into gingerbread-plus-aosp

* commit 'f43ac911379c15b6a1a240a931b0f3cbfb2fae53':
  Handle OPTIONS requests from SIP servers.
2010-09-23 16:40:09 -07:00
Chung-yih Wang
f43ac91137 Merge "Handle OPTIONS requests from SIP servers." into gingerbread 2010-09-23 16:36:18 -07:00
Romain Guy
1abe452515 Merge "Add drawing profiling to the HardwareRenderer." 2010-09-23 16:34:05 -07:00
Romain Guy
9a40babc62 Add drawing profiling to the HardwareRenderer.
Change-Id: Idf410f1764f3e73590b587d0d76a8d10c021f056
2010-09-23 16:32:47 -07:00
Romain Guy
d1fbcbb3cc Merge "Don't clip alpha layers if the flag is not set." 2010-09-23 16:18:32 -07:00
Bill Napier
297bb68d7c Merge "Fix up some issues with the onCreateContextMenu example in the Notepad tutorial." 2010-09-23 16:17:11 -07:00
Alex Sakhartchouk
b89aaacb2c Adding support for all allowed textures.
Cleaning up unused code
Adding error messages

Change-Id: I3a92476738ff7699d49feeafcd3eee6f70621acb
2010-09-23 16:16:33 -07:00
Romain Guy
fd880425e0 Don't clip alpha layers if the flag is not set.
Change-Id: I820fa66bc3699357677f37a769de52fd176d9416
2010-09-23 16:16:04 -07:00
Amith Yamasani
b723ff009e Merge "Fix for Ringtones not being saved when using Preference fragments." 2010-09-23 16:07:20 -07:00