Dianne Hackborn
63c327de70
Merge "Implement issue #3201795 : Improve transition when keyboard comes up"
2010-12-01 11:02:04 -08:00
James Dong
5faa078aeb
Merge "Add preferred preview size support in the camera framework"
2010-12-01 11:01:00 -08:00
Dianne Hackborn
0f761d6b8f
Implement issue #3201795 : Improve transition when keyboard comes up
...
ViewRoot now does a fade animation between a snapshot of the previous
layout to the new one when its content rect changes.
Also tweaked some things in the window manager to fix problems in
deciding when to animate the movement of a window and when not to.
Change-Id: I9b4b3bd53c8258bd39a2f2fc315e77cfc56a409c
2010-12-01 11:00:42 -08:00
Xavier Ducrohet
7423c09f7a
Merge "LayoutLib: get AWT image from new image factory."
2010-12-01 10:48:56 -08:00
Gilles Debunne
0eb704ca7a
Tap inside text selection dismisses selection.
...
Change-Id: I8ccc952940d3f1b3a52d506f750019a892380f40
2010-12-01 10:33:26 -08:00
Irfan Sheriff
de669ee81f
am f38b709e: (-s ours) am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'f38b709e470849943befbe88a0daeb7324f5114b':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:55:41 -08:00
Irfan Sheriff
f38b709e47
am af2d3c7c: Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
...
* commit 'af2d3c7ccebb009f31a92c1a87b0925a2891e1c4':
DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver
2010-12-01 09:53:17 -08:00
Irfan Sheriff
af2d3c7cce
Merge "DO NOT MERGE Remove wifistatetracker lock access in BroadcastReceiver" into gingerbread
2010-12-01 09:51:27 -08:00
Patrick Scott
4b90378af0
Allow one finger to scroll layers.
...
TODO: Add velocity.
Change-Id: I548ef6332b260a2aecc39422012523cb6f8e2523
2010-12-01 12:42:30 -05:00
Brad Fitzpatrick
8458ce7459
am 7e5cd796: (-s ours) am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '7e5cd7968356ea111988a372095e352d76476994':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 09:22:04 -08:00
Hung-ying Tyan
d6b0d689a7
am 6034f9b2: am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '6034f9b2664799cb4f983657a78023b49efff825':
Fix race between ending and answering a SIP call.
2010-12-01 09:21:45 -08:00
Hung-ying Tyan
db4245291b
am ed34b244: am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
...
* commit 'ed34b244f1665b604d2a291db504415b10a514d7':
Do not suppress error feedback during a SIP call.
2010-12-01 09:21:36 -08:00
David Brown
1cc52df752
am 4c11eee7: am 04639ba0: Reduce the outrageous verbosity of CallerInfo.toString().
...
* commit '4c11eee7ec3dafe943af7f4222e29b550163e58c':
Reduce the outrageous verbosity of CallerInfo.toString().
2010-12-01 09:21:22 -08:00
Mathias Agopian
6ff08a80dc
am 3248b484: am b483d5cd: fix [3237242] sensormanager sensor active count gets out of sync
...
* commit '3248b484a246f18853c284d6705b1cb9c2e52d77':
fix [3237242] sensormanager sensor active count gets out of sync
2010-12-01 09:21:09 -08:00
Mathias Agopian
33962f8c7d
am be0ece6f: am 186b68b7: Merge "allow rotation-vector to have 4 components" into gingerbread
...
* commit 'be0ece6f855ee2ab52309b6633def90ddeab38ee':
allow rotation-vector to have 4 components
2010-12-01 09:21:04 -08:00
David Brown
a4d785688c
am b9c19be7: am 91abcb62: Merge "Fix bug 3121292: Contact photo not shown correctly for SIP calls" into gingerbread
...
* commit 'b9c19be7c198dcdac7a37ea4af901af5179933d9':
Fix bug 3121292: Contact photo not shown correctly for SIP calls
2010-12-01 09:20:58 -08:00
Brad Fitzpatrick
7e5cd79683
am 981a72a1: Merge "[don\'t auto-merge] Don\'t re-read SharedPreferences unnecessarily." into gingerbread
...
* commit '981a72a1506f7e6e42747b9aa0be2001795c6619':
[don't auto-merge] Don't re-read SharedPreferences unnecessarily.
2010-12-01 08:50:00 -08:00
Brad Fitzpatrick
981a72a150
Merge "[don't auto-merge] Don't re-read SharedPreferences unnecessarily." into gingerbread
2010-12-01 08:46:52 -08:00
Cary Clark
61c6ddbb0b
Merge "start drag of text selection on initial press"
2010-12-01 08:34:58 -08:00
Chet Haase
5bed88e12d
Animators can now have dimension and color values.
...
You can now use floats, ints, dimensions, or colors as input values
in XML for Animator objects. There is still a 'valueType' attribute
that lets you specify the number values to create the animator with,
though it defaults to floats (or in the case of color inputs, to ints).
Change-Id: I65f1df802db602c33f2a0308a663b6f808148e25
2010-12-01 08:11:29 -08:00
Dan Bornstein
7ae15f6c89
Merge "Get rid of vm-internal constants."
2010-12-01 07:43:48 -08:00
Dan Bornstein
1a11f70775
Merge "Dalvik opcode-related fixes."
2010-12-01 07:43:39 -08:00
Iain Merrick
557092f26a
Merge "Add FlushCookieStore() method to CookieManager (Java side)"
2010-12-01 06:46:48 -08:00
Iain Merrick
c40fc2c31a
Add FlushCookieStore() method to CookieManager (Java side)
...
The browser app will use this to sync cookies to flash when it is
sent to the background. Corresponding C++ code is in Ia9b56f3c.
Bug: 3231371
Change-Id: I04e96affcce335191ee2075d0e160f0d8313bf76
2010-12-01 14:45:38 +00:00
Cary Clark
4a2fe17fef
start drag of text selection on initial press
...
bug:3182813
Change-Id: Id27b1caa31881ce543d395461f0504d894cf0403
2010-12-01 09:16:29 -05:00
Cary Clark
e41bb535a3
pass the x and y to retrieve anchor data
...
During a long press, the original pointer to the
node and frame may change. Pass the location instead
to attempt to find the anchor.
companion change is in external/webkit
bug:3240869
Change-Id: Id86107c1f8ce8680786163c1030421dbec062036
2010-12-01 07:40:54 -05:00
Andreas Huber
4449e4b6e2
am b460779c: (-s ours) am 30c81844: Merge "DO NOT MERGE Support for "chunked" HTTP transfer encoding." into gingerbread
...
* commit 'b460779cff97f2619e22911264350f5dbb7e76bc':
DO NOT MERGE Support for "chunked" HTTP transfer encoding.
2010-12-01 03:38:06 -08:00
Mathias Agopian
56b6e17a31
am 4b7de2c8: am 66cff624: Merge "Uses 4-th order low-pass for extracting gravity." into gingerbread
...
* commit '4b7de2c8de1427f27fc4b362c0c5997932826c16':
Uses 4-th order low-pass for extracting gravity.
2010-12-01 03:38:00 -08:00
Andreas Huber
20c2c4b2bc
am 9157478d: (-s ours) am a41c1e1d: Merge "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback." into gingerbread
...
* commit '9157478dcfb624a57e2ee83fb3cffd0bb2f72685':
DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.
2010-12-01 03:37:55 -08:00
Mathias Agopian
fb49440b99
am e3895b6f: am 24754c9f: Merge "don\'t attempt to normalize the rotation vector" into gingerbread
...
* commit 'e3895b6ff2eca41c7a1e764e88af0591cbffa560':
don't attempt to normalize the rotation vector
2010-12-01 03:37:40 -08:00
Robert Ly
dacf543dfe
am 7fac762d: am d06010c3: Merge "Doc change: updating ndk download and overview page" into gingerbread
...
* commit '7fac762d1b53e5b8fb30a60f4d043c13d334d4f3':
Doc change: updating ndk download and overview page
2010-12-01 03:37:34 -08:00
Scott Main
aa74b319e6
am 2eaa846e: am 54d21dad: docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
...
* commit '2eaa846ed34bded6889df5bce96cc17abc296cee':
docs: updates to the backup dev guide add sample code for performing restore and fix typos bug: 3180881,3125550,3125563
2010-12-01 03:37:26 -08:00
Andreas Huber
aec980ecbd
am aeaa3b3c: am 567b2bd1: Merge "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user." into gingerbread
...
* commit 'aeaa3b3c6ad004b9a13fc9d48c924c77042e8c22':
After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.
2010-12-01 03:37:19 -08:00
Eric Laurent
938f2577e6
am 371ed722: am 688f4c58: Merge "Update java doc for visualizer FFT capture." into gingerbread
...
* commit '371ed72216789505acadfac3f2e905dafb04f6e0':
Update java doc for visualizer FFT capture.
2010-12-01 03:37:07 -08:00
Andreas Huber
aa168f04c9
am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread
...
* commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55':
DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.
2010-12-01 03:37:00 -08:00
Dirk Dougherty
32d5984d31
am fb9612ba: (-s ours) am 04d2cc05: Merge "Do not merge: Doc change: API diff report for gingerbread." into gingerbread
...
* commit 'fb9612ba98f29b794244323cab6f56204d072eeb':
Do not merge: Doc change: API diff report for gingerbread.
2010-12-01 03:35:02 -08:00
Dirk Dougherty
be7afaff38
am ba5d11bd: (-s ours) am 50f8445e: Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
...
* commit 'ba5d11bdba42ea1e38eb66a347c932ce6d0b8633':
Do not merge: Doc change: highlights and SDK version notes for Android 2.3 platform.
2010-12-01 03:34:55 -08:00
Eric Fischer
50ae639c25
am 30a0e0db: (-s ours) am 3e6fb5d6: Merge "Import revised translations. DO NOT MERGE" into gingerbread
...
* commit '30a0e0db71525948682eda574786fff3e77343b6':
Import revised translations. DO NOT MERGE
2010-12-01 03:34:48 -08:00
Wink Saville
83245f576c
am 2ebb3a2d: (-s ours) am f3166799: Merge "Fix GSM permanent failure handling, DO NOT MERGE." into gingerbread
...
* commit '2ebb3a2d9b31213ced141c1807f60e13983f40dd':
Fix GSM permanent failure handling, DO NOT MERGE.
2010-12-01 03:34:39 -08:00
Ben Murdoch
45991bc13f
resolved conflicts for merge of d2607118 to master
...
Change-Id: Id6092a762af775e9b5db390feaba3e10bd98ef7c
2010-12-01 10:55:18 +00:00
Dan Bornstein
1d99b06ccf
Get rid of vm-internal constants.
...
This change makes Debug use less vm-implementation-specific code to
ask which opcodes represent method invocations.
2010-11-30 23:55:12 -08:00
Dan Bornstein
9f3155418d
Dalvik opcode-related fixes.
...
This makes Debug not hard code the number of opcodes and includes an
api-update of other opcode-related changes done in dalvik.system.
Change-Id: I70d22e1c710f224d75a22e319916724aea53f78d
2010-11-30 23:48:02 -08:00
Hung-ying Tyan
6034f9b266
am 06e8cdc0: Fix race between ending and answering a SIP call.
...
* commit '06e8cdc0f81ead604d5adf9d7b3f982e10226fd2':
Fix race between ending and answering a SIP call.
2010-11-30 23:21:40 -08:00
Brian Carlstrom
3f89edc832
Updating api.xml for merge of dalvik-dev to master
...
Change-Id: I347030bd577c4675b22849d7a0d12544bbed11ce
2010-11-30 23:10:28 -08:00
Hung-ying Tyan
06e8cdc0f8
Fix race between ending and answering a SIP call.
...
+ Also fix race between ending and changing (holding/unholding) a SIP call.
+ Remove an unused method.
Bug : 3128233
Change-Id: Ie18d8333a88f0d9906d54988243d909b58e07e4b
2010-12-01 15:02:36 +08:00
Hung-ying Tyan
ed34b244f1
am d7116ff1: Merge "Do not suppress error feedback during a SIP call." into gingerbread
...
* commit 'd7116ff1f0d1a3c14992273d0b899c3b71ba6d3f':
Do not suppress error feedback during a SIP call.
2010-11-30 22:55:37 -08:00
Hung-ying Tyan
d7116ff1f0
Merge "Do not suppress error feedback during a SIP call." into gingerbread
2010-11-30 22:53:26 -08:00
James Dong
4ddca9bacc
Add preferred preview size support in the camera framework
...
bug - 3237021
Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
2010-11-30 22:28:27 -08:00
Brian Carlstrom
f3c532632b
Merge "Tracking merge of dalvik-dev to master"
2010-11-30 22:26:17 -08:00
Brad Fitzpatrick
80234f7644
Merge "StrictMode: more accurate timings"
2010-11-30 21:41:12 -08:00