Commit Graph

4141 Commits

Author SHA1 Message Date
Suchi Amalapurapu
df4bc1d1d5 am a7bbedca: am 22dad592: Merge change I6cae32c7 into eclair
Merge commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7' into eclair-mr2-plus-aosp

* commit 'a7bbedca97498e75b32c6f6ca4afe56d4cf481f7':
  When upgrading packages with shared user ids make sure we are eliminating
2009-10-29 19:56:20 -07:00
Suchi Amalapurapu
a7bbedca97 am 22dad592: Merge change I6cae32c7 into eclair
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2

* commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e':
  When upgrading packages with shared user ids make sure we are eliminating
2009-10-29 19:26:46 -07:00
Marco Nelissen
77f8a7a37f am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2
Merge commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp

* commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7':
  - add javadoc for the account manager
2009-10-29 18:23:11 -07:00
Marco Nelissen
c81e43c8ee resolved conflicts for merge 31957f1b to eclair-mr2 2009-10-29 18:04:17 -07:00
Cary Clark
5609558c02 am 758b5b25: Merge change I35155c1d into eclair-mr2
Merge commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718' into eclair-mr2-plus-aosp

* commit '758b5b25f04e4f75e7c6c7a419bf333e4ee49718':
  divide mRestoredScale before use
2009-10-29 14:09:12 -07:00
Fred Quintana
29f043d742 am 0fca5b45: am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9' into eclair-mr2-plus-aosp

* commit '0fca5b45ffe86c1c69359e6eb3727a9953b971c9':
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-29 14:01:59 -07:00
Android (Google) Code Review
758b5b25f0 Merge change I35155c1d into eclair-mr2
* changes:
  divide mRestoredScale before use
2009-10-29 16:59:39 -04:00
Fred Quintana
0fca5b45ff am 5e5eb393: Merge change Id572ffc7 into eclair
Merge commit '5e5eb393729630800079206498f283de8f02f3a7' into eclair-mr2

* commit '5e5eb393729630800079206498f283de8f02f3a7':
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-29 13:44:08 -07:00
Cary Clark
35155c1d8b divide mRestoredScale before use
Also add debugging to help find incorrect width bug (see bug)

fixes http://b/issue?id=2218767
2009-10-29 15:34:00 -04:00
Leon Scroggins
1f7253c3c2 am 5de6389f: DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Merge commit '5de6389f2252cb6e39918e21f80a08918e0c2c02' into eclair-mr2-plus-aosp

* commit '5de6389f2252cb6e39918e21f80a08918e0c2c02':
  DO NOT MERGE. Send a message when the picture changes and find is up to search again.
2009-10-29 10:10:00 -07:00
Leon Scroggins
5de6389f22 DO NOT MERGE. Send a message when the picture changes and find is up to search again.
Fixes http://b/issue?id=2222706

Requires a change in external/webkit.  Not merging because the
change in webkit should be altered slightly.
2009-10-29 12:52:11 -04:00
Tom Taylor
6dd8a9351b am 3fc145aa: Merge change Ie8672184 into eclair-mr2
Merge commit '3fc145aafd4e04875ab3b67fed3429db30e15e48' into eclair-mr2-plus-aosp

* commit '3fc145aafd4e04875ab3b67fed3429db30e15e48':
  Add error code column to SMS
2009-10-29 08:16:25 -07:00
Android (Google) Code Review
3fc145aafd Merge change Ie8672184 into eclair-mr2
* changes:
  Add error code column to SMS
2009-10-29 11:07:15 -04:00
Dianne Hackborn
9a27909e75 am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '40946aa20183984fd60f2dbdc7708cf1c5431047' into eclair-mr2-plus-aosp

* commit '40946aa20183984fd60f2dbdc7708cf1c5431047':
  Add SDK version for MR1.
2009-10-29 01:43:33 -07:00
Dianne Hackborn
40946aa201 am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441' into eclair-mr2

* commit '1f668fff8ad2b8d79d42da5d9667d308fa0b9441':
  Add SDK version for MR1.
2009-10-29 01:20:01 -07:00
Suchi Amalapurapu
d83006cbe8 When upgrading packages with shared user ids make sure we are eliminating
the package about to be deleted or upgraded when updating permissions associated
with the shared user. Include a simple null check when retrieving the permission.

Fix PackageParser to avoid ArrayIndexOutOfBounds exceptions in several places
2009-10-29 00:46:55 -07:00
Daisuke Miyakawa
d7185d0bd2 am f5633bc7: Fix test breakage in testNickNameV21().
Merge commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b' into eclair-mr2-plus-aosp

* commit 'f5633bc7e2fddbd1104d129b9d55d74fa8c2666b':
  Fix test breakage in testNickNameV21().
2009-10-28 23:33:21 -07:00
Daisuke Miyakawa
3372855754 am d95a02c2: Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Merge commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54' into eclair-mr2-plus-aosp

* commit 'd95a02c2a652ffe35dcc0336a3e35d91b1027d54':
  Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
2009-10-28 23:33:07 -07:00
Daisuke Miyakawa
aa06a0e086 am 3c828e24: Merge change I9195a354 into eclair-mr2
Merge commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0' into eclair-mr2-plus-aosp

* commit '3c828e24a950a7fa4d17e22b5afa37a4006126f0':
  Add partial support of Android-specific properties.
2009-10-28 23:32:41 -07:00
Dan Egnor
473bbd2140 am 95240270: Instead of a raw AIDL interface, give DropBox a Java interface (android.os.DropBox); move the Binder interface behind the scenes. Make DropBoxEntry into DropBox.Entry. Make it possible to get a dropbox from an (Application)Context with the usual getSyste
Merge commit '952402704a175ba27f6c89dff1ada634c5ce5626' into eclair-mr2-plus-aosp

* commit '952402704a175ba27f6c89dff1ada634c5ce5626':
  Instead of a raw AIDL interface, give DropBox a Java
2009-10-28 23:32:21 -07:00
Daisuke Miyakawa
f5633bc7e2 Fix test breakage in testNickNameV21().
Internal issue number: 2079082
2009-10-29 12:24:26 +09:00
Daisuke Miyakawa
d95a02c2a6 Fix test breakage in Zaku. Modification to PhoneNumberUtils included.
Also add method String formatNumber(String source, int defaultFormattingType) with @hide tag.

Internal Issue number: 2217362
2009-10-29 11:01:07 +09:00
Android (Google) Code Review
3c828e24a9 Merge change I9195a354 into eclair-mr2
* changes:
  Add partial support of Android-specific properties.
2009-10-28 21:54:29 -04:00
Daisuke Miyakawa
837cba33c5 Add partial support of Android-specific properties.
In the near future, all the values which cannot be converted to
vCard property is expressed as "X-ANDROID-CUSTOM" property + MIME_TYPE.

Example (Nick name):
X-ANDROID-CUSTOM:vnd.android.cursor.item/nickname;Nicky;;;;;;;;;;;;;

All the data are stored ordered by its column name ("data1" - "data15").
Currently the code assumes the max num is 15.

Internal Issue number: 2079082
2009-10-29 09:16:31 +09:00
Fred Quintana
31957f1bad - add javadoc for the account manager
- add some checks to the AccountManagerService to keep it from crashing when a null is passed in
- cleaned up the API a bit
2009-10-28 16:29:21 -07:00
Dan Egnor
952402704a Instead of a raw AIDL interface, give DropBox a Java
interface (android.os.DropBox); move the Binder interface
behind the scenes.  Make DropBoxEntry into DropBox.Entry.
Make it possible to get a dropbox from an (Application)Context
with the usual getSystemService(DROPBOX_SERVICE) type thing.
Update the tests accordingly.
2009-10-28 15:49:11 -07:00
Android (Google) Code Review
5e5eb39372 Merge change Id572ffc7 into eclair
* changes:
  don't throw an exception when we can't find a pending sync operation in the database
2009-10-28 18:05:09 -04:00
Fred Quintana
cb41faa285 don't throw an exception when we can't find a pending sync operation in the database 2009-10-28 14:52:33 -07:00
Tom Taylor
e867218433 Add error code column to SMS
Also add code to save an error code in the DB.
2009-10-28 14:38:44 -07:00
Amith Yamasani
9acffe7639 am 26d4e539: am 678cdbe5: Fix build.
Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp

* commit '26d4e539676346236082ed1d3eccdf078980b7d5':
  Fix build.
2009-10-28 12:46:41 -07:00
Amith Yamasani
ef20445432 am 4ac5066d: am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d' into eclair-mr2-plus-aosp

* commit '4ac5066d53b40ec59a1f30ca11b8d5e1ba25659d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 12:46:26 -07:00
Amith Yamasani
26d4e53967 am 678cdbe5: Fix build.
Merge commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937' into eclair-mr2

* commit '678cdbe55e0de71436f8aad5f139eafc2ab6f937':
  Fix build.
2009-10-28 11:42:56 -07:00
Amith Yamasani
4ac5066d53 am aea1b3b2: Disambiguation between multiple pointers and swipe gestures.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2

* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
  Disambiguation between multiple pointers and swipe gestures.
2009-10-28 11:42:35 -07:00
Jaikumar Ganesh
e1cba3dbad am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair
Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp

* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
  Add Authentication Type field to the APN settings.
2009-10-28 10:37:57 -07:00
Jaikumar Ganesh
9fa7048ca3 am 6158038a: Merge change I2811f162 into eclair
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2

* commit '6158038a09069bc178970160d4b3667573bfc655':
  Add Authentication Type field to the APN settings.
2009-10-28 10:30:11 -07:00
Leon Scroggins
6ba3ef31fd am bb107bd6: Many fixes to text input in the browser, particularly when moving to a new field.
Merge commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f' into eclair-mr2-plus-aosp

* commit 'bb107bd6f7981cd2b2e31a0afc6f6bf2a6d5118f':
  Many fixes to text input in the browser, particularly when moving to a new field.
2009-10-27 13:20:33 -07:00
Android (Google) Code Review
2dfaa69801 Merge change I882d2eb8 into eclair
* changes:
  do not merge
2009-10-27 15:50:10 -04:00
Android (Google) Code Review
1f668fff8a Merge change Idb13ed9a into eclair
* changes:
  Add SDK version for MR1.
2009-10-27 15:47:57 -04:00
Amith Yamasani
678cdbe55e Fix build. 2009-10-27 11:45:08 -07:00
Leon Scroggins
bb107bd6f7 Many fixes to text input in the browser, particularly when moving to a new field.
Remove many instances where we are setting selection unnecessarily.  Instead, only
set the selection due to a click, touch, or inserting a character.  A touch will
now set the selection properly, rather than at the beginning/end, fixing
http://b/issue?id=1650395  Also fixes http://b/issue?id=2208188

Requires a change to external/webkit.
2009-10-27 13:34:45 -04:00
Amith Yamasani
aea1b3b24e Disambiguation between multiple pointers and swipe gestures.
Sometimes quickly touching the screen with two fingers will result
in the firmware thinking one finger moved very quickly. This code
tries to identify the difference between the two based on velocity
of the last N points versus the velocity of the last M points and
figure out if there was mostly acceleration or a sudden deceleration.

It's still not perfect and very dependent on the touch hardware.
2009-10-27 10:27:49 -07:00
Derek Sollenberger
29abcf9769 am 718d69f9: changing how plugins gain/lose focus.
Merge commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4' into eclair-mr2-plus-aosp

* commit '718d69f931e320b9a8d98371a0b4925d7c2e83f4':
  changing how plugins gain/lose focus.
2009-10-27 08:24:32 -07:00
Derek Sollenberger
718d69f931 changing how plugins gain/lose focus.
Previously we were keeping our own state in the UI thread to
determine when to send events to the plugin. This change removes
that logic and uses the document focus to determine when events
are to be sent. This also fixes problems with the plugins
occasionally not receiving lose focus events.

see bug http://b/2033843
2009-10-27 11:09:17 -04:00
Cary Clark
f751227b84 am 09e383c9: tweak select text
Merge commit '09e383c9ff4a3b762084e999dfb5fdd347abc151' into eclair-mr2-plus-aosp

* commit '09e383c9ff4a3b762084e999dfb5fdd347abc151':
  tweak select text
2009-10-27 08:00:49 -07:00
Cary Clark
09e383c9ff tweak select text
Explicitly draw the region and pointer from java.

Set up the starting selection criteria from both hard keyboard
and menu 'Select Text'.

Add invalidate() to show transition from arrow to ibeam
immediately, and to dismiss copy region immediately.

partially fixes http://b/issue?id=1667690
2009-10-27 10:50:16 -04:00
Mike Reed
dafc19a140 do not merge
remove the filter when we're scrolling, so we don't degrade the quality

http://b/issue?id=2174463&cookieId=2009300052135424

same change (in spirit) in MR2

https://android-git.corp.google.com/g/#change,30860
2009-10-27 08:30:13 -04:00
Dianne Hackborn
0fa35918af Add SDK version for MR1.
Change-Id: Idb13ed9a35397effbfb72a934a7db5f5a882c79c
2009-10-26 17:40:52 -07:00
Daisuke Miyakawa
9fb078ae70 am d263a064: Add a test for vCard composer.
Merge commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5' into eclair-mr2-plus-aosp

* commit 'd263a064f7a77768c3e70a98f286960b67dc1aa5':
  Add a test for vCard composer.
2009-10-26 16:18:17 -07:00
Daisuke Miyakawa
d263a064f7 Add a test for vCard composer.
Also modify the behavior of vCard composer so that it honer FN than N toward
DISPLAY_NAME.

Internal issuen number: 2195990
2009-10-27 08:10:35 +09:00
Android (Google) Code Review
6158038a09 Merge change I2811f162 into eclair
* changes:
  Add Authentication Type field to the APN settings.
2009-10-26 18:14:15 -04:00