25394 Commits

Author SHA1 Message Date
Scott Main
121ac1e5a2 am b8ce7bca: am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234'

* commit 'b8ce7bca82882e81041a3e5bddbcaa073fb37234':
  docs: edits to resources doc
2010-06-17 12:46:03 -07:00
Scott Main
dbd9d79d7d am c65d4c10: am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'c65d4c107f7c9bab731b198281109e576c2f6956'

* commit 'c65d4c107f7c9bab731b198281109e576c2f6956':
  docs: update dashboard again
2010-06-17 12:45:58 -07:00
Dan Morrill
a1b6dba25f am dde1ae84: am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7'

* commit 'dde1ae841ab77c4c0b3ef9bb25849314554a6ad7':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:45:53 -07:00
Scott Main
b8ce7bca82 am 78e6622f: am 821ca518: docs: edits to resources doc
Merge commit '78e6622fbb2bacdac68269b60cc694275ae132a4' into gingerbread-plus-aosp

* commit '78e6622fbb2bacdac68269b60cc694275ae132a4':
  docs: edits to resources doc
2010-06-17 12:42:21 -07:00
Scott Main
c65d4c107f am d22bffdf: am bccedb03: docs: update dashboard again
Merge commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059' into gingerbread-plus-aosp

* commit 'd22bffdf6f2f899913c4dcf7fa75241f7c270059':
  docs: update dashboard again
2010-06-17 12:42:18 -07:00
Dan Morrill
dde1ae841a am 45378f07: am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8' into gingerbread-plus-aosp

* commit '45378f07b8c0d79fe56fc75ad25738f8750e88c8':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:42:14 -07:00
Scott Main
78e6622fbb am 821ca518: docs: edits to resources doc
Merge commit '821ca51857f4d21b231cd9ead786227b771fe759' into gingerbread

* commit '821ca51857f4d21b231cd9ead786227b771fe759':
  docs: edits to resources doc
2010-06-17 12:37:06 -07:00
Scott Main
d22bffdf6f am bccedb03: docs: update dashboard again
Merge commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222' into gingerbread

* commit 'bccedb03fad4e72c1776d2ab9e918fab4d25f222':
  docs: update dashboard again
2010-06-17 12:36:31 -07:00
Dan Morrill
45378f07b8 am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread

* commit '6b22d81aa35d9a9b32670995c002e92588b2fe09':
  As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
2010-06-17 12:36:17 -07:00
James Dong
a05d4d886a am 48a7c1d2: am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c'

* commit '48a7c1d25f6afe020eb95ce60da95ad70f71f84c':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:50:46 -07:00
James Dong
48a7c1d25f am 42a18c09: Check and clip some video encoding parameters against media profiles before passing them to video encoder
Merge commit '42a18c09e7bb9c372382e88053409c25563ae7c9' into gingerbread-plus-aosp

* commit '42a18c09e7bb9c372382e88053409c25563ae7c9':
  Check and clip some video encoding parameters against media profiles before passing them to video encoder
2010-06-17 11:49:17 -07:00
Adam Powell
94859061e9 Merge "Merging ActionBar menu with options menu." 2010-06-17 11:38:36 -07:00
Adam Powell
96675b1df3 Merging ActionBar menu with options menu.
Options menu items may now specify if they would like to appear in the
action bar. Menu items defined in xml may set the showAsAction
attribute to one of "never"(default), "ifRoom", or "always". Action
buttons are populated as follows:

* All showAsAction="always" items become action buttons, even if it
  would crowd the navigation area of the action bar.

* If there is space remaining, showAsAction="ifRoom" items are added
  until no more will fit comfortably.

Action button click events are now handled by the
onOptionsItemSelected method used by the standard options menu.

The construction of options menus now happens earlier in order to
provide data to the action bar. Activities with an action bar can now
expect to have onCreateOptionsMenu called when activity start-up is
complete.

Activity#invalidateOptionsMenu can be used to force a refresh of menu
items where the previous API would use ActionBar#updateActionMenu.

Change-Id: If52ddf1cf9f6926206bcdeadf42072ea2c24fab9
2010-06-17 11:35:43 -07:00
James Dong
42a18c09e7 Check and clip some video encoding parameters against media profiles before passing them to video encoder
Change-Id: I69e0e7411806a4ece6c0bf0e02c74eaaf48a17ac
2010-06-17 11:34:10 -07:00
James Dong
99cc3295cf am d8402d78: am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783'

* commit 'd8402d7861ed81e90dd0a03b9a630e66551cc783':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:28:28 -07:00
James Dong
d8402d7861 am cd677a30: Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread
Merge commit 'cd677a30851e4ba8b79a41c20e20220a81719378' into gingerbread-plus-aosp

* commit 'cd677a30851e4ba8b79a41c20e20220a81719378':
  Remove hard-coded number of audio channels in AudioSource
2010-06-17 11:26:57 -07:00
James Dong
cd677a3085 Merge "Remove hard-coded number of audio channels in AudioSource" into gingerbread 2010-06-17 11:25:19 -07:00
Gilles Debunne
e6ac8b9aad Removed API changes from CL 54712.
onLoadClass(Class ) was replaced by onLoadClass(Class<?> ) in CL 54712.
This changes the API and may introduce errors in users' implementations.

Change reverted.

Change-Id: Ie578a444168423959b44857f22e13f004e108965
2010-06-17 10:57:42 -07:00
Gilles Debunne
af51e1deb7 Merge "Removed warnings in LayoutInflater." 2010-06-17 10:05:29 -07:00
Gilles Debunne
10b8c51c48 Merge "Index out of range problem in TextLine." 2010-06-17 10:05:11 -07:00
Dianne Hackborn
e2e97ce116 am 9a1034aa: am 6b7b4845: Various improvements to battery stats collection
Merge commit '9a1034aa9746b94ecb659ea849765a160bdf747e'

* commit '9a1034aa9746b94ecb659ea849765a160bdf747e':
  Various improvements to battery stats collection
2010-06-16 19:55:12 -07:00
Dianne Hackborn
9a1034aa97 am 6b7b4845: Various improvements to battery stats collection
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp

* commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb':
  Various improvements to battery stats collection
2010-06-16 18:49:28 -07:00
Gilles Debunne
3030193dc1 Removed warnings in LayoutInflater.
These changes are similar to those of CL 49296. They do not include the
generic fixes done on GenericInflater.java, which had issues and broke the build.

Added a asSubClass method in LayoutInflater which will (correctly) throw a
ClassCastException when the inflated class is not a View subclass.

Performance testing on these changes showed a 10% performance improvement,
which is still to be explained.

Change-Id: Id4d3b45f0945baccdbbda15fcce095e855b23c9a
2010-06-16 18:38:13 -07:00
Dianne Hackborn
6b7b484521 Various improvements to battery stats collection
We now clear the battery stats when unplugging after the
battery is full.  This allows us to use the "total" stats as
a new "since last charged" stat.  Total is gone.  I never used
it, it was worthless.  Since last charged is a lot more
interesting.

The battery history now collects a lot more stats, and keeps
control over how much it can collect.  Printing is now more
descriptive.

The kinds of stats have been renamed to SINCE_UNPLUGGED and
SINCE_DISCHARGED.  The other two stats are still there, but
no longer printed; a future change will eliminate them
completely along with all of their state.

Change-Id: I4e9fcfcf8c30510092c76a8594f6021e9502fbc1
2010-06-16 18:31:42 -07:00
Gilles Debunne
345cb03315 Index out of range problem in TextLine.
Recent refactoring for bidi introduced an index shift in the getOffsetBeforeAfter
method. This problem appears for multi-line text input only, when the text line
mStart index is not 0.

As a result, moving the cursor using the trackball in a multi-line EditText crashes.

Change-Id: I1f121f0f9272ef7d338399f369ba6d77e1ca71c5
2010-06-16 17:24:51 -07:00
Fabrice Di Meglio
2f7a247c92 Merge "Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)" 2010-06-16 17:01:48 -07:00
Fabrice Di Meglio
3067771f81 Fix bug #2772731 (Start deprecation of "url" Calendars column in favor of "eventsUrl" column)
- suppress references to Calendars.URL

Change-Id: Ic1fa5059516ff294940345addf930554aef0a0a9
2010-06-16 16:35:16 -07:00
Gilles Debunne
bc442294c2 Merge "Suppressed warnings in TextView." 2010-06-16 16:29:53 -07:00
Dmitri Plotnikov
b3ec983ca9 Merge "Preventing cursor leaks when a query is interrupted" 2010-06-16 16:15:08 -07:00
Dmitri Plotnikov
bef9c7a59d Preventing cursor leaks when a query is interrupted
Re-ran runtest cts-os

Change-Id: I518a2a4f842b01d082078e16643aa377a4575237
2010-06-16 15:38:07 -07:00
Fabrice Di Meglio
9cf3dc480f Merge "Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)" 2010-06-16 15:35:31 -07:00
Gilles Debunne
e15b35891f Suppressed warnings in TextView.
Change-Id: Icaa4b6d28649559b8acee970e483d50e4c00e25d
2010-06-16 15:17:21 -07:00
Mason Tang
5e81e5b96b Fixed breakage with previous API change (I34b3abad3310)
Forgot to run make update-api when adding animateFirstView attribute.

Change-Id: Iee60adf4a8b94a4c20e95669b52c16ff04f22ffd
2010-06-16 14:52:11 -07:00
Brett Chabot
83ea9e395e am 685fcf36: am c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48'

* commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48':
  Move out all framework-tests classes.
2010-06-16 14:42:51 -07:00
Brett Chabot
685fcf364b am c95812e6: Merge "Move out all framework-tests classes." into gingerbread
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp

* commit 'c95812e6cacaa14748c81323bac6561453991a24':
  Move out all framework-tests classes.
2010-06-16 14:41:00 -07:00
Brett Chabot
c95812e6ca Merge "Move out all framework-tests classes." into gingerbread 2010-06-16 14:39:41 -07:00
Irfan Sheriff
bd580127fc am 1af48920: am f897b443: Fix driver stop check
Merge commit '1af489205a3942630e6203237213e98ef53d4118'

* commit '1af489205a3942630e6203237213e98ef53d4118':
  Fix driver stop check
2010-06-16 14:35:51 -07:00
Irfan Sheriff
1af489205a am f897b443: Fix driver stop check
Merge commit 'f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp

* commit 'f897b443fed5c88c6b12e3fa1da72f231db67673':
  Fix driver stop check
2010-06-16 14:31:54 -07:00
Chet Haase
4846032ac7 Fix bug with layout animations when apps are auto-scaled.
The pivot points in RotateAnimation and ScaleAnimation are in pixel coordinates. When an app is being autoscaled, these values are incorrect and should be adjusted for the current scale factor. The fix adds API to Animation to allow ViewGroup to pass in the scaling factor.

Change-Id: I978c48f9b5aea6760148435e74e1a8d49e2f785d
2010-06-16 14:17:55 -07:00
Irfan Sheriff
f897b443fe Fix driver stop check
- Remove check for supplicant command: setScanResultHandling
- Add check for stopDriver
- Fix condition for rest of commands

Bug: 2771298
Change-Id: I1262b2228814c4f6a4c251390af2f445c5f47234
2010-06-16 14:14:22 -07:00
Mason Tang
48d9855887 Merge "Modified first animation and visibility change behavior for ViewFlipper" 2010-06-16 13:59:42 -07:00
Fabrice Di Meglio
505635583b Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)
- use constants defined into Calendar interfaces

Change-Id: I0cb8f71f7fbad61c9d9ee97db5ffeb307cd8169f
2010-06-16 13:48:45 -07:00
Mason Tang
f70036bc91 Modified first animation and visibility change behavior for ViewFlipper
- Where previously ViewAnimator only exposed inAnimation and outAnimation as
   XML attributes, modified to also include the animateFirstView flag so that
   widgets can optionally choose to omit the animation for the first child
   view.

 - Changed the behavior of ViewFlipper so that simple visibility changes do not
   trigger extraneous and distracting animations.

Change-Id: I34b3abad33102978a94f0aed5aaab9af30ba49c7
2010-06-16 13:38:15 -07:00
Ficus Kirkpatrick
00a50872b0 Quiet down some log spew.
Change-Id: I769247c7b5b0ab4a233932635752ec602442af34
2010-06-16 13:28:39 -07:00
Scott Main
821ca51857 docs: edits to resources doc
Change-Id: I1dbe5d213d8f85b2ecaeed45ddbe215f199e2c9e
2010-06-16 12:47:11 -07:00
Vasu Nori
8d66d7592f Merge "throw correct exception" 2010-06-16 12:30:48 -07:00
Patrick Scott
a50abf37e3 Merge "Move WebViewDatabase initialization into a background thread." 2010-06-16 11:58:13 -07:00
Robert Greenwalt
820c12c924 Merge "Move the net transition wakelock to ConnService." 2010-06-16 11:07:59 -07:00
Robert Greenwalt
14f2ef4c9d Move the net transition wakelock to ConnService.
When the default network goes down we lose the wake-on-incoming-data capability
until the new net is brought up and apps rebuild their connections.  We fixed this
in Wifi, but it's a general connectivity issue, not a wifi issue so moving the
mechanism to connecitivty so other networks can use it.

bug:2734419
Change-Id: I39b5d825eb6b548bd9bb8f179b89254f4db53147
2010-06-16 11:04:37 -07:00
Adam Powell
1091e00822 Merge "Fix bug 2771204" 2010-06-16 10:52:50 -07:00