14373 Commits

Author SHA1 Message Date
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
92d29c66f5 am a2a0a98a: Merge "Fix NPE if there is no accelerometer." into gingerbread
Merge commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9' into gingerbread-plus-aosp

* commit 'a2a0a98ac7ce53f282a9a4caac9d382a0eb01ef9':
  Fix NPE if there is no accelerometer.
2010-10-05 19:06:04 -07:00
Dianne Hackborn
a2a0a98ac7 Merge "Fix NPE if there is no accelerometer." into gingerbread 2010-10-05 19:02:52 -07:00
Dianne Hackborn
efa4f7f87d am 4e6baf24: Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread
Merge commit '4e6baf2473e522e6d53afa01348c564148bfbad7' into gingerbread-plus-aosp

* commit '4e6baf2473e522e6d53afa01348c564148bfbad7':
  Fix issue #3001368: API REVIEW: android.app.Activity
2010-10-05 18:59:57 -07:00
Dianne Hackborn
4e6baf2473 Merge "Fix issue #3001368: API REVIEW: android.app.Activity" into gingerbread 2010-10-05 18:56:54 -07:00
Dianne Hackborn
b499bb1069 Fix NPE if there is no accelerometer.
Change-Id: I983290a7fc3deda2a82b03ff564f1b7201cc3dd3
2010-10-05 18:54:49 -07:00
Gilles Debunne
ba04dbc6cd am 671b2a57: Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread
Merge commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a' into gingerbread-plus-aosp

* commit '671b2a57bb5a2a8669d1dabe65b4080804ee350a':
  Fix for IndexOutOfBounds in text pasting.
2010-10-05 18:15:12 -07:00
Gilles Debunne
671b2a57bb Merge "Fix for IndexOutOfBounds in text pasting." into gingerbread 2010-10-05 18:11:09 -07:00
Dianne Hackborn
3c4c2b7e6f Fix issue #3001368: API REVIEW: android.app.Activity
Bye bye, lots of junk.

Change-Id: Idd72fc525851277362b2a1ff3bb0f7865fe655fd
2010-10-05 18:07:54 -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
Gilles Debunne
330e263c4a Fix for IndexOutOfBounds in text pasting.
Made paste safe even in case of replace problems due to filters.

Bug 3042016

Change-Id: I9be34fa41fa6117502bbd959f91c562f28fb4237
2010-10-05 17:33:08 -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
Adam Powell
ee7e0efcc1 am 59c4cb9e: Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread
Merge commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8' into gingerbread-plus-aosp

* commit '59c4cb9e8fee03f770aa0fa1a2f0ec84ffb945b8':
  DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
2010-10-05 16:46:05 -07:00
Adam Powell
59c4cb9e8f Merge "DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll" into gingerbread 2010-10-05 16:39:24 -07:00
Adam Powell
65e8b47624 am 5a5fff71: Fix bug 3064143 - remove default bold on buttons
Merge commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb' into gingerbread-plus-aosp

* commit '5a5fff7101b45bc28f59e72ea4c3e57632ff9ceb':
  Fix bug 3064143 - remove default bold on buttons
2010-10-05 15:49:23 -07:00
Adam Powell
5a5fff7101 Fix bug 3064143 - remove default bold on buttons
Change-Id: Id4d09d50270c575f5179328ab6fb788b45131638
2010-10-05 15:32:48 -07:00
Adam Powell
737e8fe2c7 DO NOT MERGE Fix bug 3001751 and bug 3001584 - Gingerbread API review for over-scroll
Change-Id: If34c8ea4e15697420adad0bc404f3c278efd7c1b
2010-10-05 15:22:07 -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
Kenny Root
cfc80bd5c1 am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread
Merge commit '2c3360fe9c03536cbfd77267170b73c120c071ac' into gingerbread-plus-aosp

* commit '2c3360fe9c03536cbfd77267170b73c120c071ac':
  Remove lingering system app native libs in /data
2010-10-05 14:07:29 -07:00
Romain Guy
e21635571e Merge "Code cleanup and disable display lists for now." 2010-10-05 13:44:24 -07:00
Romain Guy
469b1dbeaf Code cleanup and disable display lists for now.
Change-Id: I681213036b5279339cb96a016d1dfb15d74dafc8
2010-10-05 13:42:35 -07:00
Christopher Tate
a0374192b9 Make View.DragThumbnailBuilder a static class
It also now uses a WeakReference to the associated View, not a hard
object pointer.

Change-Id: I37e10b3155ee7e089a72bdf050cc2d323794810f
2010-10-05 13:14:25 -07:00
Kenny Root
831baa2e25 Remove lingering system app native libs in /data
If a system app had a lingering native library in /data/data/<app>/lib,
it would prefer that over the one in /system/lib due to recent changed
in the Dalvik JNI class loading code.

To "fix" that we need to check if there are any native libraries in a
/data/data/<app>/lib directory for any non-updated system apps and
delete them during scanning.

Change-Id: If3a22e41a8531e9e5a44ba001dcea46253d47d45
2010-10-05 12:56:03 -07:00
Dianne Hackborn
38014763a2 am 89230e3b: am 458fc5f5: Merge "Fix issue #3041660: Camera image flips upside down when rotating device" into gingerbread
Merge commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d'

* commit '89230e3b7b9ec455373e3f60b62ff65589a9c57d':
  Fix issue #3041660: Camera image flips upside down when rotating device
2010-10-05 12:54:41 -07:00
Vasu Nori
54f9ac5880 Merge "STOPSHIP - add illegalStateException to catch potential deadlocks in db" 2010-10-05 12:27:27 -07:00
Gilles Debunne
ff3c191d2a resolved conflicts for merge of 8390651c to master
Change-Id: Ibaa6034dbf87473dfb7d8a324a5f91fc745b99aa
2010-10-05 12:11:56 -07:00
Brett Chabot
111a4135d8 am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
2010-10-05 11:05:37 -07:00
Adam Cohen
ef52176f12 Changing AdapterViewAnimator to use the new animation APIs
Change-Id: Ifefb83c391914ac623d75e0faca723b95786861d
2010-10-05 11:02:25 -07:00
Brett Chabot
b9a40068b5 Merge "Failing test cleanup." into gingerbread 2010-10-05 11:00:07 -07:00
Vasu Nori
6d970255af STOPSHIP - add illegalStateException to catch potential deadlocks in db
database lock() should not be called from a synchronized methods
in database layer. add code to check.
this will catch potential deadlock situations sooner

Change-Id: I9d913f5e2af304f4d9ad5b2641c3a768c4bc97f9
2010-10-05 10:50:45 -07:00
Patrick Scott
4243a3a6ed Add postSync so that the chrome stack has access.
Bug: 3053149
Change-Id: I75f5422afcacf4ae70a2aa26188446251d7f84da
2010-10-05 09:30:24 -04:00
Adam Powell
41170a1a05 am abcbb1a1: Fix bug 3061544 and some clipping errors.
Merge commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66' into gingerbread-plus-aosp

* commit 'abcbb1a1989e8c6adec607b3964dc187f5526e66':
  Fix bug 3061544 and some clipping errors.
2010-10-04 23:16:00 -07:00
Adam Powell
abcbb1a198 Fix bug 3061544 and some clipping errors.
Change-Id: I124d0bcae080c27e2978be7eecfbb131f101a35f
2010-10-04 23:10:11 -07:00
Dianne Hackborn
cb9f1e4d30 am 6f7e10ca: Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread
Merge commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283' into gingerbread-plus-aosp

* commit '6f7e10ca0aa869c4b3ed4c37e56cf9d471fd9283':
  Make it easier to figure out whether an app can go on sd card.
2010-10-04 23:04:53 -07:00
Dianne Hackborn
6f7e10ca0a Merge "Make it easier to figure out whether an app can go on sd card." into gingerbread 2010-10-04 23:00:25 -07:00
Neal Nguyen
daa9b8c69a am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread
Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp

* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
  Fixing some flakiness of some DL Manager tests.
2010-10-04 21:09:52 -07:00
Neal Nguyen
95037fb1a6 Merge "Fixing some flakiness of some DL Manager tests." into gingerbread 2010-10-04 21:07:37 -07:00