Chet Haase
6a5fc4bc62
Merge "New TimeInterpolator interface for android.animation package."
2010-10-07 13:18:36 -07:00
Chet Haase
e0ee2e9f31
New TimeInterpolator interface for android.animation package.
...
The new animation package's reliance on the old Interpolator interface (in
android.view.animation) was an eyesore. Adding TimeInterpolator, and having the
old Interpolator interface extend it, allows the new Animator classes to break
the tie to the older animation package completely. However, developers can still
use the older Interpolator-based classes, such as AccelerateInterpolator,
because they all implicitly extend the new TimeInterpolator class.
Change-Id: I41132fa56167ba564f4839113289114d0ea31a92
2010-10-07 12:27:06 -07:00
Dianne Hackborn
8c4e779a4c
am e112b744: am 930d6c3c: Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
...
Merge commit 'e112b744c08cd7dcffe142f3cd22c96870bad482'
* commit 'e112b744c08cd7dcffe142f3cd22c96870bad482':
Fix issue #3056500 : Problem report for ASTRO
2010-10-07 12:22:14 -07:00
Kenny Root
c5610a4c13
am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
...
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'
* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
Remove lingering system app native libs in /data
2010-10-07 12:21:22 -07:00
Joe Onorato
7d56e3d3cb
Merge "Add extra to ACTION_BATTERY_CHANGED to indicate an invalid charger is attached."
2010-10-07 10:52:30 -07:00
Kristian Monsen
b5c564fed2
Merge WebKit at r68651 : Update user agent string
...
Change-Id: Ib48186532c9a6033f1fb107f1fc072cd4fe89820
2010-10-07 11:17:12 +01:00
satok
5847b20c0c
Merge "Add InputMethodEnabler for enabling input methods and subtypes"
2010-10-06 22:46:32 -07:00
satok
47a44916e2
Add InputMethodEnabler for enabling input methods and subtypes
...
- Copyed functionarity from LanguageSettings.java
TODO: Save enabled InputMethodSubtypes
Change-Id: I7b4fb1a79cb8b3229f88773d261430e23ba7aae2
2010-10-07 14:43:16 +09:00
Jeff Sharkey
7172bdac31
Assign parent TextAppearances to Holo.Light theme.
...
Change-Id: I60e82ec78c4e766bf1fbd86a0d6cd6c972cbbf81
2010-10-06 22:37:04 -07:00
Romain Guy
e743bd2bac
Merge "Don't clear the framebuffer when not needed."
2010-10-06 19:51:36 -07:00
Romain Guy
6b7bd24659
Don't clear the framebuffer when not needed.
2010-10-06 19:49:23 -07:00
Christopher Tate
5ada6cb059
More drag/drop adjustments:
...
* Make View.onDragEvent() public instead of protected.
* No longer @hide View.startDrag()
* Properly manage the boundaries of DRAG_STARTED / DRAG_ENDED notifications
to windows (and as a result don't send bogus empty DRAG_STARTED events or
double-recycle pooled DragEvents)
Change-Id: Ib75f5c1417640c82a5b043c555e02d6e6f4b4d9c
2010-10-06 17:33:10 -07:00
Brett Chabot
c7912274b0
am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread
...
Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'
* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
Failing test cleanup.
2010-10-06 17:10:48 -07:00
Adam Powell
6ed895a4fa
am 41170a1a: am abcbb1a1: Fix bug 3061544 and some clipping errors.
...
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9'
* commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9':
Fix bug 3061544 and some clipping errors.
2010-10-06 17:08:52 -07:00
Dianne Hackborn
72b526a13c
am cb9f1e4d: am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
...
Merge commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0'
* commit 'cb9f1e4d30ab4f9203e30abe807cbe33d07db4a0':
Make it easier to figure out whether an app can go on sd card.
2010-10-06 17:08:15 -07:00
Neal Nguyen
e2562ca8f1
am daa9b8c6: am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
...
Merge commit 'daa9b8c69a3069d5533176e6caa286380b4675c2'
* commit 'daa9b8c69a3069d5533176e6caa286380b4675c2':
Fixing some flakiness of some DL Manager tests.
2010-10-06 17:07:58 -07:00
Mathias Agopian
7930b5bc06
am 722665c5: am ef115308: fix build. SurfaceView.setFrame needed to be hidden
...
Merge commit '722665c5f76e81bed646490977ea30f38aaa00da'
* commit '722665c5f76e81bed646490977ea30f38aaa00da':
fix build. SurfaceView.setFrame needed to be hidden
2010-10-06 17:07:30 -07:00
Mathias Agopian
3243cbc9b2
am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
...
Merge commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2'
* commit 'b99e81ab4cccac537fc7ae8d07d59a0f6c1395d2':
fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-06 16:17:44 -07:00
Nick Pelly
664d035829
am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
...
Merge commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee'
* commit 'c7bfb13fd92cda6ae5894ed2ee63e1ab4d7b25ee':
New API stubs: NdefMessage and NdefRecord.
2010-10-06 16:16:56 -07:00
Gilles Debunne
3139ab218a
am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset."
...
Merge commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02'
* commit 'e9e9467688d46b9a1b2f5599bab1fe154b2eaf02':
Revert "Restored ic_dialog_menu_generic asset."
2010-10-06 16:07:42 -07:00
Gilles Debunne
efaa4f075d
resolved conflicts for merge of 1153629c to master
...
Change-Id: I2838fc7e5a428fd52c811087b6c5481cf95eef0e
2010-10-06 14:38:27 -07:00
Neel Parekh
03bc711c8a
Merge "Fix pressed vs selected typo in onCreateDrawableState"
2010-10-06 11:45:55 -07:00
Neel Parekh
e537858ba7
Fix pressed vs selected typo in onCreateDrawableState
...
Change-Id: I7a415cacf29ed8c6c558f6b29902edd76fc98ea6
2010-10-06 11:39:53 -07:00
Irfan Sheriff
be93061e2c
Merge "Add LinkAddress"
2010-10-06 11:26:44 -07:00
Shimeng (Simon) Wang
e99b0b992a
Merge "Add wrapper method for native JNI call."
2010-10-06 11:20:05 -07:00
Irfan Sheriff
ed5d7d17c9
Add LinkAddress
...
LinkAddress stores IP address + prefix for a network link
Change-Id: Id3e74e9d0a62121d097ebdc9be064eeea257ba1f
2010-10-06 11:04:05 -07:00
Adam Cohen
32e60fbea7
Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"
2010-10-06 10:43:18 -07:00
Adam Cohen
3042944c6e
Fixing AdapterViewAnimator crash when associated adapter is empty
...
Change-Id: I3186452eb93f1141b06531507b13d87804e684d4
2010-10-06 10:39:11 -07:00
Fred Quintana
c8b7971cb3
Merge "Make a separate active sync queue for initialization and regular syncs."
2010-10-06 10:03:19 -07:00
Steve Block
e86b8a18df
Merge "Make sure that we send the DeviceOrientation error event only once"
2010-10-06 08:30:13 -07:00
Steve Block
8980343b13
Make sure that we send the DeviceOrientation error event only once
...
Change-Id: Iff095ad4d282635c567b0c85a286056e23ca38e3
2010-10-06 16:12:06 +01:00
Brian Carlstrom
c9d5b31f84
Fix instance count to be long
...
Change-Id: I88b17c4ff17a04db6e931f9b25885bdf05d4453c
2010-10-05 22:23:41 -07:00
Brian Carlstrom
c21550a8d1
Adding android.os.Debug.countInstancesOfClass
...
- Debug.countInstancesOfClass is just a wrapper on
dalvik.system.VMDebug.countInstancesOfClass to avoid code from
depending on the dalvik classes directly
- Existing usages of VMDebug.countInstancesOfClass in ActivityThread
and ViewDebug are converted to the new Debug.countInstancesOfClass
- Existing use of OpenSSLSocketImpl.instanceCount, which is being
removed, is converted to Debug.countInstancesOfClass(OpenSSLSocketImpl.class)
Bug: 3015791
Change-Id: Iefa781292d5b82a63bad7254c913a09deb3b7888
2010-10-05 21:38:57 -07:00
Robert Greenwalt
759bece170
Merge "Turn on some debugging info"
2010-10-05 19:14:45 -07:00
Robert Greenwalt
ba175a5e13
Turn on some debugging info
...
bug:3060742
Change-Id: I86f4e0b3f678c80e1bee11abd32ab0b9e0563b09
2010-10-05 19:12:26 -07:00
Dianne Hackborn
0f8ee7439a
Merge "Implement permission granting in clipboard."
2010-10-05 17:54:35 -07:00
Vasu Nori
ecba4f3373
Merge "fix broken build"
2010-10-05 17:46:36 -07:00
Vasu Nori
c2ce721fcf
fix broken build
...
Change-Id: Ic00e8b98780d48928e05ee27f855e8211fb1ec47
2010-10-05 17:45:37 -07:00
Fred Quintana
918339ab82
Make a separate active sync queue for initialization and regular syncs.
...
This entails allowing multiple syncs to happen in parallel, with
different limits for regular and initialization syncs.
Change-Id: I0e47c6515af5c98faf899f91855b342b0d0c708c
2010-10-05 17:25:19 -07:00
Vasu Nori
b8e109aa9e
Merge "annotate some tests large - just in case they take longer. bug:3066136"
2010-10-05 17:08:53 -07:00
Gilles Debunne
0f935ebfff
am b3e95d9f: am c37eac24: Restored ic_dialog_menu_generic asset.
...
Merge commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800'
* commit 'b3e95d9fc4365d20a39aa3ef61da537dabf5b800':
Restored ic_dialog_menu_generic asset.
2010-10-05 17:02:27 -07:00
Shimeng (Simon) Wang
bf01312965
Add wrapper method for native JNI call.
...
This is to check whether a given mimeType is supported in Android media
framework.
issue: 2816278
Change-Id: I66d379d039c4e1f4a8528654ece006335fd4463f
2010-10-05 16:59:05 -07:00
Vasu Nori
790762ca8f
annotate some tests large - just in case they take longer. bug:3066136
...
Change-Id: I89ab0454f592748f971b678a3ae23724eb6fc2e5
2010-10-05 16:53:57 -07:00
Chet Haase
2e292e9da4
Merge "Adding next/prev to fragment animations and to PreferenceActivity"
2010-10-05 15:21:34 -07:00
Gilles Debunne
a4a01b5d6b
am 6f4f0106: am b621e203: Merge "Removed icon in Alert dialog header." into gingerbread
...
Merge commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4'
* commit '6f4f01062bc78ae765c970e8796b8dbef432f8a4':
Removed icon in Alert dialog header.
2010-10-05 15:17:17 -07:00
Chet Haase
9ff82bf2b3
Adding next/prev to fragment animations and to PreferenceActivity
...
Adding a new concept of "next" and "previous" to fragment.s Previously, fragments would
either be placed onto or taken off of the stack, or would just replace the current
fragment. The new next/prev capability gives the ability to run a transition that is
specific to next/previous operations, such as navigating forward and backward in a list.
New next/prev animations may be associated with a fragment replace operation to get the
next/prev animations built into the system (next animates things up, prev animates them
down).
Change-Id: Ia9f3663bac009376420d845b396ac51b8e4d1647
2010-10-05 15:13:24 -07:00
Dianne Hackborn
e112b744c0
am 930d6c3c: Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
...
Merge commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6' into gingerbread-plus-aosp
* commit '930d6c3cd5ad387489eb1d35a38beeafe54166b6':
Fix issue #3056500 : Problem report for ASTRO
2010-10-05 14:45:32 -07:00
Dianne Hackborn
930d6c3cd5
Merge "Fix issue #3056500 : Problem report for ASTRO" into gingerbread
2010-10-05 14:42:04 -07:00
Dianne Hackborn
817c24752c
Fix issue #3056500 : Problem report for ASTRO
...
Change-Id: Ifa07dbc50930f5d6a20cdc0ee541c0566f3785ba
2010-10-05 14:40:22 -07:00
Dianne Hackborn
90f4aafa33
Implement permission granting in clipboard.
...
Change-Id: I9a7a949d1aaf4b3beabceaf807fb7d3b040e4ea8
2010-10-05 14:09:08 -07:00