Commit Graph

16870 Commits

Author SHA1 Message Date
Romain Guy
d9fc776c82 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-plus-aosp

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:04 -07:00
Romain Guy
a8a720d8cd Fix possible NPE in the code that restores widgets' state.
Bug #2189714
Reviewed by: ryanpc

Change-Id: I0d74deb6dc8e90e3b0eafd6b3c16b0c557c72873
2009-10-15 15:09:26 -07:00
Fred Quintana
5edb466a62 fix grammar in the grant permissions UI 2009-10-15 13:59:22 -07:00
Leon Scroggins
94bda52a51 am f6411533: am be3feda4: Do not show soft keyboard for readonly textfields.
Merge commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774'

* commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774':
  Do not show soft keyboard for readonly textfields.
2009-10-15 13:17:18 -07:00
Leon Scroggins
f6411533ef am be3feda4: Do not show soft keyboard for readonly textfields.
Merge commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be' into eclair-mr2-plus-aosp

* commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be':
  Do not show soft keyboard for readonly textfields.
2009-10-15 13:07:40 -07:00
Cary Clark
3e1bfce7ff am 800ca40d: am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5'

* commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5':
  check for native initialization before calling public function
2009-10-15 12:53:31 -07:00
Cary Clark
800ca40dfa am 9f208824: Merge change I7f97011b into eclair-mr2
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp

* commit '9f2088240272086cd9eb94d01b1872a1088b76f2':
  check for native initialization before calling public function
2009-10-15 12:48:17 -07:00
Leon Scroggins
be3feda46e Do not show soft keyboard for readonly textfields.
Part of a fix for http://b/issue?id=2159869.  The request to show
the soft input has been moved to nativeTextInputMotionUp, where it
can check if the input field is readOnly.  This way it is also
handled by shortPressOnTextField, for when a user shortpresses
on the field.
2009-10-15 15:44:37 -04:00
Android (Google) Code Review
9f20882402 Merge change I7f97011b into eclair-mr2
* changes:
  check for native initialization before calling public function
2009-10-15 15:41:06 -04:00
Cary Clark
7f97011b55 check for native initialization before calling public function
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.

These cases can be triggered by the monkey.

Fixes http://b/issue?id=2187719
2009-10-15 15:29:08 -04:00
Fred Quintana
901035acb6 am efe1910b: am 4874dcd4: Merge change I1a23191b into eclair-mr2
Merge commit 'efe1910b375d751a73c9c8d6204759731014cd8c'

* commit 'efe1910b375d751a73c9c8d6204759731014cd8c':
  fix build
2009-10-15 12:09:58 -07:00
Fred Quintana
efe1910b37 am 4874dcd4: Merge change I1a23191b into eclair-mr2
Merge commit '4874dcd417d7a07a8e802709c5d6895dc408d422' into eclair-mr2-plus-aosp

* commit '4874dcd417d7a07a8e802709c5d6895dc408d422':
  fix build
2009-10-15 11:41:21 -07:00
Android (Google) Code Review
4874dcd417 Merge change I1a23191b into eclair-mr2
* changes:
  fix build
2009-10-15 14:33:39 -04:00
Tom Taylor
458de6b00f am a5adb633: am 662e4991: Merge change I6719d39d into eclair-mr2
Merge commit 'a5adb63398a59aabaa03e4ddc9be3dbda55fdff7'

* commit 'a5adb63398a59aabaa03e4ddc9be3dbda55fdff7':
  Fix alert dialog separator
2009-10-15 11:32:25 -07:00
Fred Quintana
1a23191bbd fix build 2009-10-15 11:31:30 -07:00
Tom Taylor
a5adb63398 am 662e4991: Merge change I6719d39d into eclair-mr2
Merge commit '662e49912a0a6e2d3c33c2fef72309b165d775eb' into eclair-mr2-plus-aosp

* commit '662e49912a0a6e2d3c33c2fef72309b165d775eb':
  Fix alert dialog separator
2009-10-15 11:22:26 -07:00
Android (Google) Code Review
662e49912a Merge change I6719d39d into eclair-mr2
* changes:
  Fix alert dialog separator
2009-10-15 14:15:03 -04:00
Cary Clark
69661d3666 am fc52737e: am badd8399: fix copy/paste using trackball on passion
Merge commit 'fc52737ecc8f62b403d0ce534bc7f01fa9c6749a'

* commit 'fc52737ecc8f62b403d0ce534bc7f01fa9c6749a':
  fix copy/paste using trackball on passion
2009-10-15 11:12:54 -07:00
Cary Clark
fc52737ecc am badd8399: fix copy/paste using trackball on passion
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp

* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
  fix copy/paste using trackball on passion
2009-10-15 11:02:27 -07:00
Tom Taylor
6719d39db1 Fix alert dialog separator
Update the line that separates the alert dialog's title from a custom view
with the correct asset to match the rest of the UI.
2009-10-15 11:01:26 -07:00
Cary Clark
badd8399ca fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.

The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.

Clicking the trackball at the end of selecting text no longer
sends a click event.

Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
2009-10-15 13:55:06 -04:00
Fred Quintana
462e1b5d6c am 033696e0: am 70d71fdc: Merge change Ib839afc3 into eclair-mr2
Merge commit '033696e0597b64e54c2efa82ac618d6e4228571f'

* commit '033696e0597b64e54c2efa82ac618d6e4228571f':
  remove the bind helper and bind directly
2009-10-15 10:29:55 -07:00
Fred Quintana
033696e059 am 70d71fdc: Merge change Ib839afc3 into eclair-mr2
Merge commit '70d71fdcbf365ed148f2f4252a6975851424637e' into eclair-mr2-plus-aosp

* commit '70d71fdcbf365ed148f2f4252a6975851424637e':
  remove the bind helper and bind directly
2009-10-15 10:24:29 -07:00
Android (Google) Code Review
70d71fdcbf Merge change Ib839afc3 into eclair-mr2
* changes:
  remove the bind helper and bind directly
2009-10-15 13:16:31 -04:00
Fred Quintana
2bc632bcf1 am 3ff0a5e5: am d753f070: Merge change I5d199964 into eclair-mr2
Merge commit '3ff0a5e55da0af3e120adbcc6ec3494d0905964e'

* commit '3ff0a5e55da0af3e120adbcc6ec3494d0905964e':
  add an IPC for sync initialization
2009-10-15 09:59:53 -07:00
Fred Quintana
3ff0a5e55d am d753f070: Merge change I5d199964 into eclair-mr2
Merge commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017' into eclair-mr2-plus-aosp

* commit 'd753f070f73e41bcd316c562e3b807aaf4bf1017':
  add an IPC for sync initialization
2009-10-15 09:50:40 -07:00
Android (Google) Code Review
d753f070f7 Merge change I5d199964 into eclair-mr2
* changes:
  add an IPC for sync initialization
2009-10-15 12:43:23 -04:00
Christian Sonntag
7e60acdac2 am 144c8eb7: am e54ebd8c: Merge change I647ae75e into eclair-mr2
Merge commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62'

* commit '144c8eb7abbfcfdc7ffcc8caa57472b9b7dbda62':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
2009-10-14 18:16:34 -07:00
Christian Sonntag
144c8eb7ab am e54ebd8c: Merge change I647ae75e into eclair-mr2
Merge commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c' into eclair-mr2-plus-aosp

* commit 'e54ebd8c4f589a0a4a257a8d79b288dda67f3f8c':
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
2009-10-14 18:11:22 -07:00
Daisuke Miyakawa
1867b9a4c0 am ca802b6e: am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca'

* commit 'ca802b6ed5f60d3abc38d103b1cbd35e8883c4ca':
  Add tests and fix vCard code.
2009-10-14 16:56:21 -07:00
Android (Google) Code Review
e54ebd8c4f Merge change I647ae75e into eclair-mr2
* changes:
  Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps. after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 19:53:09 -04:00
Daisuke Miyakawa
ca802b6ed5 am 8b12144d: Merge change I170c8251 into eclair-mr2
Merge commit '8b12144dad94bc0807e20590d72b4aadc56189d4' into eclair-mr2-plus-aosp

* commit '8b12144dad94bc0807e20590d72b4aadc56189d4':
  Add tests and fix vCard code.
2009-10-14 16:46:09 -07:00
Daisuke Miyakawa
99a0a2cd73 Add tests and fix vCard code.
Now, basic tests are almost ready.

TODO:
- importer test toward multiple vCard input (though it was tested with real usage)
- exporter tests for multiple composition
- tests with non-Ascii
- tests with special types like TYPE_DOCOMO

ISSUE:
In order to fully check the validity of exporter, we may have to develop
some vCard importer which rejects vCard which is valid but a kind of dubious.

Internal Issue Number: 2160039
2009-10-14 16:07:40 -07:00
Fred Quintana
e7424ffdaf add an IPC for sync initialization 2009-10-14 16:06:39 -07:00
Fred Quintana
b839afc33e remove the bind helper and bind directly 2009-10-14 15:57:28 -07:00
Fred Quintana
c9ce985dab am 4a7ab6c2: am c4989b1b: update the authtoken permission granting UI
Merge commit '4a7ab6c24ccaefb21ac8b502e3d7f92dbd9bbae3'

* commit '4a7ab6c24ccaefb21ac8b502e3d7f92dbd9bbae3':
  update the authtoken permission granting UI
2009-10-14 15:51:26 -07:00
Nick Pelly
2cd5250abb am aeed585d: am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit 'aeed585d19f4db006ca765eed37d629831e4b563'

* commit 'aeed585d19f4db006ca765eed37d629831e4b563':
  Revert "Remove STOPSHIP comment."
2009-10-14 15:51:13 -07:00
Fred Quintana
4a7ab6c24c am c4989b1b: update the authtoken permission granting UI
Merge commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325' into eclair-mr2-plus-aosp

* commit 'c4989b1b75848acbeaf53850fbcfbf2f8812e325':
  update the authtoken permission granting UI
2009-10-14 15:43:20 -07:00
Nick Pelly
aeed585d19 am 43f2b4e9: am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '43f2b4e9c6811e0411446336ac4118565aa8eb88' into eclair-mr2-plus-aosp

* commit '43f2b4e9c6811e0411446336ac4118565aa8eb88':
  Revert "Remove STOPSHIP comment."
2009-10-14 15:43:13 -07:00
Christian Sonntag
647ae75e57 Add Gservice for vending_restore_window, this determines the duration after first setup, during which we do not reconcile backup apps.
after that apps restored via market/backup will be treated just like any other app and being synced with the server state.
2009-10-14 15:26:08 -07:00
Fred Quintana
c4989b1b75 update the authtoken permission granting UI
http://b/issue?id=2165284
2009-10-14 15:24:46 -07:00
Nick Pelly
43f2b4e9c6 am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-mr2

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:06 -07:00
Nick Pelly
ac11a9d166 am 53f33d84: Revert "Remove STOPSHIP comment."
Merge commit '53f33d84776a0bad668e361365a7049b16f8a929' into eclair-plus-aosp

* commit '53f33d84776a0bad668e361365a7049b16f8a929':
  Revert "Remove STOPSHIP comment."
2009-10-14 12:37:02 -07:00
Jean-Baptiste Queru
b7463eb0c7 merge from open-source master 2009-10-14 12:26:31 -07:00
Nick Pelly
53f33d8477 Revert "Remove STOPSHIP comment."
This reverts commit 3d0726b4d8

Change-Id: Ie1ce5d09cc0b799ef0799f30eedc95f0ca5d3fad
DrNo: jerrryw
2009-10-14 12:25:29 -07:00
Nick Pelly
09897fb287 am b355695a: am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'b355695a093df11387828b3c588fd05c04b8907b'

* commit 'b355695a093df11387828b3c588fd05c04b8907b':
  Remove STOPSHIP comment.
2009-10-14 12:17:39 -07:00
Nick Pelly
b355695a09 am 52cb8557: am a04ca9b4: Merge change I2492bffe into eclair
Merge commit '52cb8557525c1b25163cd5e4ad317a7a64119aae' into eclair-mr2-plus-aosp

* commit '52cb8557525c1b25163cd5e4ad317a7a64119aae':
  Remove STOPSHIP comment.
2009-10-14 12:12:36 -07:00
Nick Pelly
0b9d9f4b5b am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-plus-aosp

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:58 -07:00
Nick Pelly
52cb855752 am a04ca9b4: Merge change I2492bffe into eclair
Merge commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085' into eclair-mr2

* commit 'a04ca9b489ce0e92fa156f8ce26459a463b3e085':
  Remove STOPSHIP comment.
2009-10-14 12:03:19 -07:00
Android (Google) Code Review
a04ca9b489 Merge change I2492bffe into eclair
* changes:
  Remove STOPSHIP comment.
2009-10-14 14:55:44 -04:00