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

28731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
c9923876d4 software renderer: fix [3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID 
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
 2010-10-20 17:21:43 -07:00
Dianne Hackborn
674b856c15 am fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 
Merge commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp

* commit 'fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
  Fix java doc on FLAG_EXTERNAL.
 2010-10-20 17:14:59 -07:00
Dianne Hackborn
fb2cd0aa9d Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread 2010-10-20 17:12:27 -07:00
Mathias Agopian
cd1e02d460 Add a test application to dump all the EGLConfig available 
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
 2010-10-20 17:10:47 -07:00
Jean-Baptiste Queru
5d919b4387 Merge "Make disabled TextViews uneditable" 2010-10-20 16:46:52 -07:00
Jean-Baptiste Queru
c20f205d10 am 5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0" 
Merge commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp

* commit '5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
  BatteryService: Set bool to true if sysfs entry is not 0
 2010-10-20 16:45:50 -07:00
Jean-Baptiste Queru
5bfef1ba05 Merge "BatteryService: Set bool to true if sysfs entry is not 0" 2010-10-20 16:35:17 -07:00
Jean-Baptiste Queru
eceace47c5 am 81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 
Merge commit '81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp

* commit '81925e665c1e25d04cbc10e7333e793416bdc98f':
  Fix FastScroller overlay position bug
 2010-10-20 16:33:51 -07:00
Jean-Baptiste Queru
81925e665c Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center" 2010-10-20 16:29:15 -07:00
Dianne Hackborn
eddfc04a08 Fix java doc on FLAG_EXTERNAL. 
Change-Id: Ic533b3a6c3300a986dd8d0da04243d723cf393ef
 2010-10-20 16:03:37 -07:00
Kenny Root
c925944733 am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 
Merge commit 'ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp

* commit 'ddf8fe505636d3b4435cb9952266765aab20b86d':
  Fix isUsbMassStorageConnected() will always return true
 2010-10-20 14:13:21 -07:00
Dianne Hackborn
153bf6c8d7 am e9e23405: Merge "Fix issue #3113424: Battery stats don\'t reset on Crespo" into gingerbread 
Merge commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp

* commit 'e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
  Fix issue #3113424: Battery stats don't reset on Crespo
 2010-10-20 14:10:29 -07:00
Kenny Root
ddf8fe5056 Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread 2010-10-20 14:10:00 -07:00
Dianne Hackborn
e9e2340583 Merge "Fix issue #3113424: Battery stats don't reset on Crespo" into gingerbread 2010-10-20 14:08:26 -07:00
Justin Ho
a747b43993 am d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 
Merge commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp

* commit 'd5aaff548d62c07fb5fb2d47e58161e77c401616':
  DO NOT MERGE - Updated media playback transport controls (b/3116268)
 2010-10-20 14:04:00 -07:00
Hung-ying Tyan
bdc15d8b43 am 4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 
Merge commit '4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp

* commit '4056ab97be6224dcc00ac70843544790f2d65fb7':
  Add permission requirements to SipAudioCall and SipManager javadoc.
 2010-10-20 14:03:54 -07:00
Hung-ying Tyan
940b4d1c45 am 6037a056: Fix n-way conf call in SipPhone. 
Merge commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp

* commit '6037a056ea0dda27a286ddcb527b323b58a1c7c7':
  Fix n-way conf call in SipPhone.
 2010-10-20 14:03:43 -07:00
Jeff Hamilton
e55806a555 am 23392a84: Fix the build. 
Merge commit '23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp

* commit '23392a84bcb961d3fd50142ec40ce6ac6db89018':
  Fix the build.
 2010-10-20 13:57:26 -07:00
Hung-ying Tyan
d691b36cde am 6fe795ec: Do another contact lookup if the first one fails and... 
Merge commit '6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp

* commit '6fe795ecd35c4d49822d349424fc71b660577dfc':
  Do another contact lookup if the first one fails and...
 2010-10-20 13:57:20 -07:00
Hung-ying Tyan
fd0ba81c02 am baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 
Merge commit 'baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp

* commit 'baced375ba5f374445c44a2115700d69693794a0':
  Silently reject a ringing call when another call is dialing/ringing.
 2010-10-20 13:56:59 -07:00
Dianne Hackborn
b50187237c am 74b1ed32: Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Merge commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp

* commit '74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
  Fix issue #3113219: NativeActivity using wrong lib path with Java code
 2010-10-20 13:56:03 -07:00
Hung-ying Tyan
5102856947 am 1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread 
Merge commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp

* commit '1180f2a099a134c40f923c7e4162a5e7d7ca0184':
  Remove ringtone API from SipAudioCall.
 2010-10-20 13:54:25 -07:00
Dirk Dougherty
18cbc0e58a am 3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 
Merge commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp

* commit '3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
  Doc change: escape angle brackets in javadoc comment.
 2010-10-20 13:54:09 -07:00
Justin Ho
d5aaff548d Merge "DO NOT MERGE - Updated media playback transport controls (b/3116268)" into gingerbread 2010-10-20 13:35:40 -07:00
Hung-ying Tyan
4056ab97be Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread 2010-10-20 13:28:02 -07:00
Hung-ying Tyan
6037a056ea Fix n-way conf call in SipPhone. 
+ Avoid concurrent modification when forming >3-way conf call.
+ Revise SipConnection.separate() to put the newly separated call to foreground.

Bug: 3114987

Change-Id: If6204e7e3cc05f4a516c33657a368b53a0ad014d
 2010-10-21 03:59:04 +08:00
Justin Ho
6312822111 DO NOT MERGE - Updated media playback transport controls (b/3116268) 
Change-Id: Ic496308d4f72e9135e35a1b29bc20feb990c3507
 2010-10-20 12:44:46 -07:00
Hung-ying Tyan
e87b644402 Add permission requirements to SipAudioCall and SipManager javadoc. 
Bug: 3116259

Change-Id: I00a033794e9d3e1c2d2ccfe4e612cd50003ec2ee
 2010-10-21 03:27:20 +08:00
Dianne Hackborn
266e607bde Fix issue #3113424: Battery stats don't reset on Crespo 
Change-Id: I38cc3cdfa9cb1466fe3659f001ee57aecf9df179
 2010-10-20 12:26:48 -07:00
Jeff Hamilton
23392a84bc Fix the build. 
Change-Id: Id5bfa0f91e6ec687201a320a1eb4d8a46050875e
 2010-10-20 14:20:29 -05:00
Hung-ying Tyan
6fe795ecd3 Do another contact lookup if the first one fails and... 
it's a SIP call and the peer's username is all numeric. The all-numeric username
could be a PSTN number.

Bug: 3105116 (case #2)

Change-Id: I1de9cfac3aab1c4c89935176264d07693adb5e7d
 2010-10-21 02:54:57 +08:00
Hung-ying Tyan
baced375ba Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread 2010-10-20 11:49:26 -07:00
Hung-ying Tyan
88e3f0ad28 Silently reject a ringing call when another call is dialing/ringing. 
http://b/issue?id=3109483
http://b/issue?id=3103072

Change-Id: I34f13225319c7f2a41e1ea9e25811866432ab809
 2010-10-21 02:38:04 +08:00
Shachar Shemesh
2fdf272855 Make the base direction of the Arabic error pages RTL 
Change-Id: I10df9cb92d18850e8893298b2edfd9e57ca5cfef
 2010-10-20 11:01:32 -07:00
Shachar Shemesh
56a7739755 Set the base direction of the Hebrew error pages to RTL 
Change-Id: I435e724f9638e294b7e03527e7c6244a307f010e
 2010-10-20 11:01:26 -07:00
Dianne Hackborn
74b1ed3231 Fix issue #3113219: NativeActivity using wrong lib path with Java code 
Use the same path whether the .apk has dalvik code or not.

Change-Id: I66397d7f7e328d5580565ceb17a941afac0e0f8b
 2010-10-20 10:22:45 -07:00
Tony Wu
b09773dee0 Fix isUsbMassStorageConnected() will always return true 
After UMS mounted, isUsbMassStorageConnected() will always return true even if USB is disconnected.
It's because mUmsEnabling will always be ture.

Change-Id: Ib24b2359ea2684eb0a9faeb880f383e87630e6e1
 2010-10-20 10:17:28 -07:00
Hung-ying Tyan
1180f2a099 Merge "Remove ringtone API from SipAudioCall." into gingerbread 2010-10-20 09:47:45 -07:00
Dirk Dougherty
3466e1fc6d Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread 2010-10-20 09:34:24 -07:00
Hung-ying Tyan
9b449e5606 Remove ringtone API from SipAudioCall. 
(watch out auto-merge conflict for SipAudioCall).

Bug: 3113033, related CL: https://android-git/g/#change,75185

Change-Id: Ib48d3b990e229e0b341e47e10e76934e1a50d10f
 2010-10-20 22:51:22 +08:00
Wu-cheng Li
b982fb4fd3 Mirror the preview for front-facing cameras. do not merge 
Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V
or FLIP_H first. The formula should be changed after overlay is fixed.

bug:3059865
Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
 2010-10-20 18:29:18 +08:00
Hung-ying Tyan
e894ff7a76 am b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread 
Merge commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp

* commit 'b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
  Return display name in SipConnection.getCnapName().
 2010-10-19 23:03:25 -07:00
Hung-ying Tyan
b595e094e3 Merge "Return display name in SipConnection.getCnapName()." into gingerbread 2010-10-19 23:00:16 -07:00
James Dong
22b37fa6e0 File writer size estimation improvement 
o Do not count the reserved space for moov if the meta data size is small
o Do not count the extra 1KB disturbing small file estimation.
o Reduce the default minimum reserved space from 4 KB to 3 KB.
o Estimate the moov size based on both duration AND file size limit is set
  and set it to the smaller estimated value.

low risk change

bug - 3111983

Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
 2010-10-19 22:59:22 -07:00
Hung-ying Tyan
538e58fc75 Return display name in SipConnection.getCnapName(). 
Bug: 3105116 (case #1)

Change-Id: Iedf3c8de07213c786cffb861bd52c3b4a768a86c
 2010-10-20 11:21:55 +08:00
Mathias Agopian
add9db83fd am f4cd9be0: Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 
Merge commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp

* commit 'f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
  fix [2236865] STOPSHIP: bump soft gl and egl minor version number
 2010-10-19 18:26:28 -07:00
Mathias Agopian
f4cd9be039 Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread 2010-10-19 18:23:19 -07:00
Mindy Pereira
62ad0db623 am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp

* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
 2010-10-19 18:23:18 -07:00
Scott Main
b619e3332d am 218bf884: am a6df4b1b: docs: add note to froyo platform doc that not all locales are included in the sdk image 
Merge commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0' into gingerbread-plus-aosp

* commit '218bf88446d01fb2f8d79eec3be59bee995f9cb0':
  docs: add note to froyo platform doc that not all locales are included in the sdk image
 2010-10-19 17:43:37 -07:00
Mindy Pereira
6fbc5d9c19 DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow. 
Fixes b/3111778 overscroll glitch in news & weather

Change-Id: Ic255da1f7c4301ea3980acc4fa033c9f17a60dac
 2010-10-19 17:38:24 -07:00