32831 Commits

Author SHA1 Message Date
Joe Onorato
dc565f4b3a work around race condition which causes us to try to load the phone
status bar on the tablet.

Change-Id: Id5ad1192b4667622957fd0c48870ea22a480e0b5
2010-10-04 15:27:22 -04:00
Mindy Pereira
94e461309b am 53fb09b4: (-s ours) am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '53fb09b42f8862650f959c30c1ab104142fa873a'

* commit '53fb09b42f8862650f959c30c1ab104142fa873a':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
2010-10-04 10:20:47 -07:00
Mindy Pereira
53fb09b42f am 106950f2: Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread
Merge commit '106950f20bd352ed72ddf4490b2e19d305e36a74' into gingerbread-plus-aosp

* commit '106950f20bd352ed72ddf4490b2e19d305e36a74':
  DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
2010-10-04 10:13:32 -07:00
Mindy Pereira
106950f20b Merge "DO NOT MERGE. Fix logic for switching between overscroll and scroll modes." into gingerbread 2010-10-04 10:10:06 -07:00
Daisuke Miyakawa
c0ed31d7a9 am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a'

* commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a':
  Refrain warning when not appropriate. Do not merge
2010-10-04 08:40:18 -07:00
Daisuke Miyakawa
07fb33efe8 am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread
Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge
2010-10-04 08:36:27 -07:00
Daisuke Miyakawa
d8f1a54016 Merge "Refrain warning when not appropriate. Do not merge" into gingerbread 2010-10-04 08:31:56 -07:00
Daisuke Miyakawa
8eef13b472 Refrain warning when not appropriate. Do not merge
Change-Id: I0066a3d0a2204cfc4beacb69aafccb35b9326bbb
2010-10-04 07:59:34 -07:00
Kenny Root
6d95c0d941 am ac754073: am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583'

* commit 'ac7540733cafcca5bdb1842e1ebcb396ba064583':
  ZipFileRO: moar logging and wrap close
2010-10-04 07:54:06 -07:00
Kenny Root
ac7540733c am b58b2714: Merge "ZipFileRO: moar logging and wrap close" into gingerbread
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp

* commit 'b58b27142a936aa76897a7040c08b8a0989a685b':
  ZipFileRO: moar logging and wrap close
2010-10-04 07:41:11 -07:00
Kenny Root
b58b27142a Merge "ZipFileRO: moar logging and wrap close" into gingerbread 2010-10-04 07:28:20 -07:00
Hung-ying Tyan
51d2adab83 am 1f34ffd7: am 5cab38ba: Merge "SIP: minor fixes." into gingerbread
Merge commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99'

* commit '1f34ffd7e36de5d1a12d4a3901c3ac4e4e56cb99':
  SIP: minor fixes.
2010-10-03 22:49:09 -07:00
Hung-ying Tyan
1f34ffd7e3 am 5cab38ba: Merge "SIP: minor fixes." into gingerbread
Merge commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb' into gingerbread-plus-aosp

* commit '5cab38ba11d976c54f28f4bdbced78040cba1cbb':
  SIP: minor fixes.
2010-10-03 22:45:49 -07:00
Hung-ying Tyan
5cab38ba11 Merge "SIP: minor fixes." into gingerbread 2010-10-03 22:43:28 -07:00
James Dong
4fd446f7b7 Video size retrieval/configuration support in camera hal
This is the first part of the camera hal change required for
0-memcpy of input video frames for video recording.

o removed check in setVideoSize()/getVideoSize() for impl consistency

Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
2010-10-03 21:24:49 -07:00
Brad Fitzpatrick
2b282d312d am 3d019a37: am 83d52229: Doc fix: duplicate word \'of\'
Merge commit '3d019a374fa41a11fb7b718770076e61235d1c45'

* commit '3d019a374fa41a11fb7b718770076e61235d1c45':
  Doc fix: duplicate word 'of'
2010-10-03 21:19:12 -07:00
Brad Fitzpatrick
3d019a374f am 83d52229: Doc fix: duplicate word \'of\'
Merge commit '83d522290e56f614d0d9373d47c2b54b9e207795' into gingerbread-plus-aosp

* commit '83d522290e56f614d0d9373d47c2b54b9e207795':
  Doc fix: duplicate word 'of'
2010-10-03 21:13:51 -07:00
Brad Fitzpatrick
83d522290e Doc fix: duplicate word 'of'
Change-Id: I45a4ca443becc2f2cf02cbca2bd61ef2ee590b5c
2010-10-03 21:07:21 -07:00
Hung-ying Tyan
9ea96c6cad SIP: minor fixes.
+ Log error instead of crashing app process in SipManager's ListenerRelay.
+ Terminate dialog and transaction in SipSessionGroup.reset().
+ Remove redundant reset() in SipSessionGroup.

Change-Id: Ifbf29d2c9607ffe1a1a50b0c131ee3a4e81a0d0e
2010-10-04 08:07:42 +08:00
Romain Guy
a07139d923 Merge "Initialize font texture cache." 2010-10-03 14:40:12 -07:00
Romain Guy
1de1083e98 Initialize font texture cache.
Now that text is renderer using bilinear filtering, each character is surrounded by
a 1 pixel border. This border needs to be initialized to a transparent value.

Change-Id: I26d3195db4bd576ac1f2da4c8f8e4dd18768bf12
2010-10-03 14:39:09 -07:00
Wink Saville
30d4d57e8e Add SystemService.restart.
This allows easy access to the new SystemProperties ctl.restart
control command.

Change-Id: I3e82710873adff54ef8a0cb53ca13d4dcab2408d
2010-10-03 13:53:26 -07:00
Mindy Pereira
e6c4747276 DO NOT MERGE. Fix logic for switching between overscroll and scroll modes.
The issue here was originally that webview was showing twice
as intense of an effect for edge glow as lists. The root cause
was that abslistview was calling onPull half as often as webview. This
occurred because every time an action_move came into the touch handler
for abslistview when it was in overscroll, the mode was ALWAYS changed
back to scroll mode. Therefore, half the action_move events were
essentially being eating by the abslistview state machine.
After fixing that issue, needed to decrease the intensity of the effect
for webview and abslistview by halving the PULL_DISTANCE_GLOW_FACTOR.

Change-Id: I5dbdf4f1219f3bb157a71d4fccf8fa42e2abe047
2010-10-03 12:52:11 -07:00
Adam Powell
937a6f6357 am 7e53f3d7: am 624380a1: Fix bug 3047653 - Text select handles stick around when they shouldn\'t
Merge commit '7e53f3d70994cfef255953e1df1881d057477d06'

* commit '7e53f3d70994cfef255953e1df1881d057477d06':
  Fix bug 3047653 - Text select handles stick around when they shouldn't
2010-10-02 18:39:13 -07:00
Adam Powell
7e53f3d709 am 624380a1: Fix bug 3047653 - Text select handles stick around when they shouldn\'t
Merge commit '624380a14def6c2acdb473e09c36139acbcefbf9' into gingerbread-plus-aosp

* commit '624380a14def6c2acdb473e09c36139acbcefbf9':
  Fix bug 3047653 - Text select handles stick around when they shouldn't
2010-10-02 18:36:27 -07:00
Adam Powell
624380a14d Fix bug 3047653 - Text select handles stick around when they shouldn't
Text select handles will now fade out on their own after a few seconds
since many apps expect a selection to be persistent while a text field
stays focused in touch mode. The user may tap within the selection to
bring the anchors back.

Text select handles will also disappear upon leaving touch mode.

Fix a bug that impaired cut/paste from the context menu.

Change-Id: I8f431e2d261aec02581150125d11324a3ee11656
2010-10-02 18:31:38 -07:00
Adam Powell
d4b8cad13b am 077c79cb: am 03876c90: Fix text anchor fade-out positioning
Merge commit '077c79cb43c3b6059a92ba1eb51af94972adadef'

* commit '077c79cb43c3b6059a92ba1eb51af94972adadef':
  Fix text anchor fade-out positioning
2010-10-02 17:51:37 -07:00
Adam Powell
077c79cb43 am 03876c90: Fix text anchor fade-out positioning
Merge commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab' into gingerbread-plus-aosp

* commit '03876c905f3874f3ac8deb5a23ee0f77d4c04bab':
  Fix text anchor fade-out positioning
2010-10-02 17:49:07 -07:00
Adam Powell
03876c905f Fix text anchor fade-out positioning
Change-Id: I5660481fb883c28c88e384be2f26e67aa854ec8e
2010-10-02 17:44:47 -07:00
Adam Powell
ef29bb5bc9 am 0d843dc4: am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs
Merge commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506'

* commit '0d843dc47929ff6e3dbaa4cc1d07de7fbdba8506':
  Fix bug 3058082 - text anchor positioning within moving dialogs
2010-10-02 17:04:01 -07:00
Adam Powell
0d843dc479 am ea32f94e: Fix bug 3058082 - text anchor positioning within moving dialogs
Merge commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c' into gingerbread-plus-aosp

* commit 'ea32f94ec4c14fe21b536139762c5332d1b5484c':
  Fix bug 3058082 - text anchor positioning within moving dialogs
2010-10-02 16:59:42 -07:00
Adam Powell
ea32f94ec4 Fix bug 3058082 - text anchor positioning within moving dialogs
Change-Id: I8f0b515c73d2b3055b4072425418f837eb021d4f
2010-10-02 16:51:36 -07:00
Adam Powell
1ff349020c am 53303da0: am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field
Merge commit '53303da0a78da2042ec60226ee290d2c903e6023'

* commit '53303da0a78da2042ec60226ee290d2c903e6023':
  Fix bug 3024080 - Date picker month field uses numeric text field
2010-10-02 13:18:49 -07:00
Adam Powell
53303da0a7 am 8bcbebd4: Fix bug 3024080 - Date picker month field uses numeric text field
Merge commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db' into gingerbread-plus-aosp

* commit '8bcbebd4178b2e9aca9ee3bd9e1e12c42e74c8db':
  Fix bug 3024080 - Date picker month field uses numeric text field
2010-10-02 13:07:56 -07:00
Adam Powell
8bcbebd417 Fix bug 3024080 - Date picker month field uses numeric text field
NumberPicker now uses text entry when displayed value strings are
provided.

Change-Id: I555a7d6b64ad6a5af131b3e1d8c638dcdb00d02c
2010-10-02 12:52:28 -07:00
Hung-ying Tyan
aeba1bc0c3 Revert "Revert "resolved conflicts for merge of 8788d140 to master""
This reverts commit bdf11be97bd732e8891ae19342c937da6e659afa.
Fix a missing import from manual merge.

Change-Id: If373626f07250cbfe07e5c04cf02ad9ee5a0ab2a
2010-10-03 01:18:34 +08:00
Jason Chen
bdf11be97b Revert "resolved conflicts for merge of 8788d140 to master"
This reverts commit 2874c3dec4f9ffd59b2be3de62c1148534396828, reversing
changes made to 7afbb30d636351334d101fd0caef391fa409230d.
2010-10-01 22:49:42 -07:00
Jeff Brown
a4d45cda69 am ea58d1ba: am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1'

* commit 'ea58d1bac2960c1794f048bfa5d1a60b1a3d23a1':
  Wait for initial device scan to finish before updating config.
2010-10-01 21:49:39 -07:00
Jeff Brown
0f5f2e4c27 am e11b76d3: am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'e11b76d3efb056edea301d53a354d0730adf3520'

* commit 'e11b76d3efb056edea301d53a354d0730adf3520':
  Minor logging changes to input dispatcher to help with debugging.
2010-10-01 21:49:29 -07:00
Hung-ying Tyan
2874c3dec4 resolved conflicts for merge of 8788d140 to master
Change-Id: I7eaf2b7fe968e8d4cf6c5a2a4e66b8584c1dc78c
2010-10-02 12:42:23 +08:00
Jason Chen
7afbb30d63 Fix the build
Change-Id: Iedef9d315a304c73beb07e39d924dc65a7b73fc9
2010-10-01 19:44:17 -07:00
Jeff Brown
ea58d1bac2 am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp

* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
  Wait for initial device scan to finish before updating config.
2010-10-01 19:03:42 -07:00
Jeff Brown
e11b76d3ef am f6295b35: Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread
Merge commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba' into gingerbread-plus-aosp

* commit 'f6295b35db7a7c40d4fb1c981e231bebcf13e2ba':
  Minor logging changes to input dispatcher to help with debugging.
2010-10-01 19:01:14 -07:00
Jeff Brown
e951ef07dd Merge "Wait for initial device scan to finish before updating config." into gingerbread 2010-10-01 19:01:11 -07:00
Jeff Brown
f6295b35db Merge "Minor logging changes to input dispatcher to help with debugging." into gingerbread 2010-10-01 18:58:32 -07:00
Jeff Brown
7342bb9693 Wait for initial device scan to finish before updating config.
This change narrows the opportunity for a race condition setting the
resource Configuration while devices are being updated.

Change-Id: I58efa563f4129ab0fce7108511d16a99dff7e451
2010-10-01 18:55:43 -07:00
Jake Hamby
cc8c6496b7 resolved conflicts for merge of 3543a40b to master
Change-Id: I307c8f1277b84763e537ced0ac3410ec06fce431
2010-10-01 18:35:13 -07:00
Hung-ying Tyan
8788d14036 am 306137d9: SIP telephony cleanup.
Merge commit '306137d97f40a4f807c54a75210343c9262360d1' into gingerbread-plus-aosp

* commit '306137d97f40a4f807c54a75210343c9262360d1':
  SIP telephony cleanup.
2010-10-01 18:32:03 -07:00
Kenny Root
6cb241f902 ZipFileRO: moar logging and wrap close
There is apparently still a race upon reading the entry Local File
Header that can't be tracked down, so move the LFH check inside the
mutex-protected block so we can call lseek again to see where we are
when we log an error.

Also, close() can fail so use TEMP_FAILURE_RETRY on it so we don't
unwittingly leak file descriptors when Mean Mr. EINTR comes a-knocking.

Change-Id: I753abad0bd882fe28f7281c406fa76f64393ef4c
2010-10-01 18:30:59 -07:00
Jake Hamby
3543a40b24 am 7888486d: Merge "Add subaddress to SMS fingerprint calculation."
Merge commit '7888486d1c930301535069bd90bb0bf3525b2bb5' into gingerbread-plus-aosp

* commit '7888486d1c930301535069bd90bb0bf3525b2bb5':
  Add subaddress to SMS fingerprint calculation.
2010-10-01 18:13:58 -07:00