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

24447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ying Wang
e05184f271 Merge "Output proguard keep flags for fragment classes." into gingerbread 2010-08-13 15:26:21 -07:00
Jake Hamby
3f442ece25 Merge "Fix character count bug and Javadoc typos in SMS (with test cases)" into gingerbread 2010-08-13 15:15:36 -07:00
Eric Fischer
244152bfb9 Merge "Change aapt's warning message to suggest formatted="false", not "true"." into gingerbread 2010-08-13 14:54:15 -07:00
Jake Hamby
4f17082167 Merge "Fix typo and bug in CTS test class." into gingerbread 2010-08-13 14:51:09 -07:00
Eric Fischer
98ee11ddb7 Change aapt's warning message to suggest formatted="false", not "true". 
True is the default and specifying it won't suppress the warning.

Change-Id: I8ecc919b4059bf3321e781649cb46dd2d3807592
 2010-08-13 14:49:55 -07:00
Ficus Kirkpatrick
0a6bfe2ae2 am 2abde6e0: Add --max-res-version flag to aapt. 
Merge commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c' into gingerbread

* commit '2abde6e0ddaed3d2d60bad984a2adc3acbb8164c':
  Add --max-res-version flag to aapt.
 2010-08-13 14:45:39 -07:00
Ficus Kirkpatrick
7525c2cfbb Merge "Add --max-res-version flag to aapt." into gingerbread 2010-08-13 14:22:34 -07:00
Ficus Kirkpatrick
588f228d6a Add --max-res-version flag to aapt. 
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from froyo.

Change-Id: Ia4eabae535b95b75d18b0c83135d44ed9a95b9eb
 2010-08-13 14:20:51 -07:00
Romain Guy
1e4aa48cfd Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread 2010-08-13 14:18:55 -07:00
Mathias Agopian
ab5750115d fix [2912927] Can't get NV_draw_path extension to work 
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.

Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
 2010-08-13 14:17:58 -07:00
Ficus Kirkpatrick
2abde6e0dd Add --max-res-version flag to aapt. 
aapt will ignore any versioned resource directories over the
specified version (if used).  e.g. --max-res-version=6 will
cause layout-land-v7 to be ignored.

Merged from eclair.

Change-Id: I40ccf820c8a6e3074fccc987dd60a511dd8eb0de
 2010-08-13 14:13:08 -07:00
Ying Wang
561a91824f Output proguard keep flags for fragment classes. 
Change-Id: I28c10fbf18b91f8ba3dfc2575cd41215f65f11ec
Bug: 2916847
 2010-08-13 14:06:58 -07:00
Jake Hamby
17f616823a Fix character count bug and Javadoc typos in SMS (with test cases) 
Fix a character count bug I discovered while working on related SMS
bugs. Includes a new set of test cases to verify the fix for the
buggy calculateLength() methods ("runtest frameworks-telephony").

You can also verify that the counter works properly in the Mms app
by typing characters until the boundary is crossed where an
additional message part is required. The counter should count down
to 0 characters remaining before increasing the message count.

Change-Id: I4de68b82dfc53dcae094865798f2c0235a355d43
 2010-08-13 14:01:31 -07:00
Jake Hamby
a8f39537ca Fix typo and bug in CTS test class. 
- Fix Javadoc typo in PhoneSubInfo.java
- Fix ArrayIndexOutOfBoundsException in SimulatedCommands.java

Change-Id: I40dcd52cf9d6990f1f845fca5c1d61cdff93f4d7
 2010-08-13 12:16:15 -07:00
Mikael Kanstrup
876247784e DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response. 
When the driver was configured to run with power save mode disabled the
power save mode incorrectly got reverted back to AUTO mode right after
DHCP response. The power save mode value is now saved so that the device
properly reverts back to a previous mode after DHCP response.

Change-Id: Ie68cd107872d233bf422e24130a1eb9f6432db91
Bug: 2834260
 2010-08-13 10:24:04 -07:00
Erik Gilling
94364b91a2 surfaceflinger: don't check HWComposer numLayers unless one exists 
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
 2010-08-13 10:10:48 -07:00
Eric Laurent
c8d0d6307f Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread 2010-08-13 08:00:14 -07:00
John Wang
686a950558 Merge "Update switch call and accept call." into gingerbread 2010-08-12 17:30:38 -07:00
James Dong
e95d192fae Mainly fix two mistakes that I made: 
1. When the ERROR_END_OF_STREAM is returned from read, the input buffer is not initialized
   release it would lead to crash

2. The mPrevTimestampUs is not initialized and thus fail in the CHECK(mPrevTimestampUs, timeUs)

Change-Id: Id1e51575fb8b3ca48e80547efd3a3a82dfac773b
 2010-08-12 16:47:17 -07:00
Mike Dodd
5f96138ba6 Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread 2010-08-12 16:45:19 -07:00
Andreas Huber
72ac1f26d7 Fix software avc encoder crash at EOS. 
Change-Id: I738dc24556e41ce518b67babeff16cd934c2d1b1
 2010-08-12 16:14:29 -07:00
Mike Dodd
8741dfacf2 Support getting codec, width, and height in URL for gtalk playback. 
Format is rtsp://gtalk/codec/width/height

For example:
  rtsp://gtalk/H263-1998/320/200

Change-Id: If7c73fea1e1d0de89b22a8f0d12acba1c862d6fe
 2010-08-12 16:04:35 -07:00
Mathias Agopian
b7d1be01ae Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread 2010-08-12 15:07:29 -07:00
Mathias Agopian
f8e705dea4 Fix a couple issues with the new hwcomposer HAL 
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list

Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
 2010-08-12 15:03:26 -07:00
John Wang
c159c84699 Update switch call and accept call. 
Change-Id: Ifdd1af77e3eca08f6c931605ecfb275835b78709
 2010-08-12 14:52:39 -07:00
Trevor Johns
404bffbeab am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo 
Merge commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795' into gingerbread

* commit '4f3c5372a56ac47dac9c22c7f7ce97152128c795':
  Fix subscribe links for Developer Forums doc.
 2010-08-12 14:30:11 -07:00
Trevor Johns
4f3c5372a5 Merge "Fix subscribe links for Developer Forums doc." into froyo 2010-08-12 14:27:33 -07:00
Wu-cheng Li
ccaa002848 Merge "Improve camera documentation." into gingerbread 2010-08-12 14:04:07 -07:00
Wu-cheng Li
699fe93979 Improve camera documentation. 
Change-Id: I3c9e5e6de5ce64b8d7d892483930238fa9cc247c
 2010-08-12 14:00:14 -07:00
James Dong
d790c6485a Add lost preview surface detection in the JNI layer 
Throws an IOException if this happens rather than crashes

Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
 2010-08-12 11:59:56 -07:00
Andreas Huber
ae3a1f4595 Merge "Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied." into gingerbread 2010-08-12 11:02:17 -07:00
Andreas Huber
66aa0f3d95 Merge "APacketSource is too verbose." into gingerbread 2010-08-12 11:02:06 -07:00
Andreas Huber
00237b79a0 Fix the h.263 assembler to properly subset a buffer's range if it already has a range applied. 
Change-Id: I7cc468a3095537347d86803579001458b62fcadb
 2010-08-12 10:58:24 -07:00
James Dong
708ec39c21 Don't send late frames to software encoders for encoding 
o Document on what frames will be rejected and what frames will be accepted

Change-Id: I5a5d489ad3d2b50dbb40a0f6e01529312ce81c54
 2010-08-12 10:40:58 -07:00
James Dong
45cb3cfacf Merge "Handle large audio lost" into gingerbread 2010-08-12 10:07:51 -07:00
James Dong
b6541f0af8 Merge "Fix a crash due to unnecessary check on the codec config data for H263 video track" into gingerbread 2010-08-12 10:07:38 -07:00
James Dong
581581fe1a Merge "Fix all fd leaks in authoring engine" into gingerbread 2010-08-12 09:13:14 -07:00
Andreas Huber
3f55576e04 APacketSource is too verbose. 
Change-Id: I48ca7b070d89e43405d05e5f41e650db587e12b4
 2010-08-12 09:07:20 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support. 
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
 2010-08-11 18:15:29 -07:00
Mathias Agopian
65f2490e1b Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6 should fix sim build, hopefully 
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
 2010-08-11 17:31:33 -07:00
Jeff Brown
bb65ae020f Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine 
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
 2010-08-11 17:18:30 -07:00
Mathias Agopian
90dc48b17f Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
24d7050ca6 Merge "don't handle the transparent region of a layer in draw()" into gingerbread 2010-08-11 16:21:01 -07:00
Mathias Agopian
8e7515d9c9 Merge "get rid of our LayerVector implementation" into gingerbread 2010-08-11 16:20:38 -07:00
Mathias Agopian
025822a03a Merge "keep a list of visible sorted surfaces" into gingerbread 2010-08-11 16:19:16 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents. 
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
 2010-08-11 16:18:13 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Mathias Agopian
e0d5f5bcf5 call into hwcomposer HAL when present 
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
 2010-08-11 16:08:45 -07:00