6520 Commits

Author SHA1 Message Date
Android (Google) Code Review
5fe1afe9cc Merge change 21603 into eclair
* changes:
  Fix infinite recursion.
2009-08-17 15:25:23 -07:00
Dianne Hackborn
46407d831e Fix infinite recursion. 2009-08-17 15:22:29 -07:00
Robert Greenwalt
25a5d3db3f Fix CDMA to startup/shutdown based on apn en/disab
Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
2009-08-17 15:20:14 -07:00
Android (Google) Code Review
01f750d6fa Merge change 21587 into eclair
* changes:
  BatteryService: Remove hard coded power supply names.
2009-08-17 14:26:06 -07:00
Android (Google) Code Review
ace6a5cfc0 Merge change 21408 into donut
* changes:
  Improved drawing/matrix support in layoutlib
2009-08-17 14:22:24 -07:00
Mike Lockwood
304928fb7e BatteryService: Remove hard coded power supply names.
Search all subdirectories of /sys/class/power_supply and match on
the power supply type instead.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 17:20:40 -04:00
Android (Google) Code Review
f5e6a211b1 Merge change 21572 into donut
* changes:
  Add constants to adjust Vending input and output buffer sizes.
2009-08-17 14:19:42 -07:00
Xavier Ducrohet
2473ef5654 Improved drawing/matrix support in layoutlib
- Make the custom Canvas actually replace the original one so that it's used
  even by parts of the framework that allocate their own temp Canvas object.
- Better support for Matrix: added support for mapPoint() and mapRect(), and invert()
- Implemented drawBitmap() with a Matrix, and made the paint object not NPE when null.
2009-08-17 14:17:05 -07:00
Fred Quintana
718671b441 fix build breakage 2009-08-17 14:08:37 -07:00
Jason Sams
60fae2af3c am b93cdae7: Merge change 21570 into eclair
Merge commit 'b93cdae749c48a629331c9b039d3a0488752b82f'

* commit 'b93cdae749c48a629331c9b039d3a0488752b82f':
  Update fountain and add writable flag to script slots.
2009-08-17 14:02:06 -07:00
Android (Google) Code Review
b93cdae749 Merge change 21570 into eclair
* changes:
  Update fountain and add writable flag to script slots.
2009-08-17 13:58:20 -07:00
Jason Sams
334ea0c98f Update fountain and add writable flag to script slots. 2009-08-17 13:56:09 -07:00
Android (Google) Code Review
093918a628 Merge change 21549 into donut
* changes:
  Import revised translations.  DO NOT MERGE
2009-08-17 13:42:24 -07:00
Jasperln
b95277e762 Add constants to adjust Vending input and output buffer sizes.
- Needed for Bug: 2058060
2009-08-17 13:29:11 -07:00
Eric Fischer
4d399f7e59 Import revised translations. DO NOT MERGE 2009-08-17 13:13:44 -07:00
Fred Quintana
b5f93cd3c0 am 5e787c42: - add a "isSyncable" flag to a given account/authority pair that indicates whether or not syncs should be attempted for it. - add public methods to get and set this parameter
Merge commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614'

* commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614':
  - add a "isSyncable" flag to a given account/authority pair that
2009-08-17 13:07:26 -07:00
Romain Guy
596191889f am 76c830b2: Merge change 21540 into eclair
Merge commit '76c830b229fc21d5ea0ea28955084cc187e25fc6'

* commit '76c830b229fc21d5ea0ea28955084cc187e25fc6':
  Fix listview clicks with the trackball.
2009-08-17 13:05:05 -07:00
Fred Quintana
5e787c42f2 - add a "isSyncable" flag to a given account/authority pair that
indicates whether or not syncs should be attempted for it.
- add public methods to get and set this parameter
2009-08-17 13:02:42 -07:00
Android (Google) Code Review
76c830b229 Merge change 21540 into eclair
* changes:
  Fix listview clicks with the trackball.
2009-08-17 13:00:26 -07:00
Romain Guy
df01607380 Fix listview clicks with the trackball. 2009-08-17 12:51:30 -07:00
Dianne Hackborn
c678a93a73 Fix issue #2056585: applications can put phone in inconsistent state wrt airplane mode 2009-08-17 12:51:17 -07:00
Mathias Agopian
8f5af58265 am 0ef135d5: Merge change 21537 into eclair
Merge commit '0ef135d5c79ff5b443b43f8743250044700a8bb5'

* commit '0ef135d5c79ff5b443b43f8743250044700a8bb5':
  really be more friendly with C
2009-08-17 12:40:41 -07:00
Android (Google) Code Review
0ef135d5c7 Merge change 21537 into eclair
* changes:
  really be more friendly with C
2009-08-17 12:37:25 -07:00
Mathias Agopian
2b8954809e really be more friendly with C 2009-08-17 12:33:20 -07:00
Dan Murphy
13e934daac am 921831b4: Merge change 21522 into eclair
Merge commit '921831b4dcad1898c265889430a32367e99ef6c1'

* commit '921831b4dcad1898c265889430a32367e99ef6c1':
  Dock changes:Docking station intents
2009-08-17 12:31:44 -07:00
Android (Google) Code Review
921831b4dc Merge change 21522 into eclair
* changes:
  Dock changes:Docking station intents
2009-08-17 12:27:06 -07:00
Dan Murphy
c9f4eaf438 Dock changes:Docking station intents
Docking station intents for dock switch driver.
Add DockObserver and updated Intent.java and systemserver.jave

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>

	modified:   core/java/android/content/Intent.java
	new file:   services/java/com/android/server/DockObserver.java
	modified:   services/java/com/android/server/SystemServer.java

Docking station updates

Add constants for the dock

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 15:23:24 -04:00
Dianne Hackborn
160e4facf6 am 1a797546: Merge change 21380 into eclair
Merge commit '1a797546d75d2c85d6fefeefdc55de051aa66018'

* commit '1a797546d75d2c85d6fefeefdc55de051aa66018':
  More work on wallpapers.
2009-08-17 11:52:06 -07:00
Android (Google) Code Review
1a797546d7 Merge change 21380 into eclair
* changes:
  More work on wallpapers.
2009-08-17 11:46:57 -07:00
Mike LeBeau
cfa419b754 Correct comments for startSearch in Activity and SearchManager to explain
Donut behavior correctly.
2009-08-17 11:10:32 -07:00
Romain Guy
75229368c2 am 54ba86f0: Merge change 21512 into eclair
Merge commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5'

* commit '54ba86f0e236a55fb4dc3aabbd81078f586321a5':
  Honor the clickable and enabled properties in ListView.
2009-08-17 11:09:21 -07:00
Android (Google) Code Review
54ba86f0e2 Merge change 21512 into eclair
* changes:
  Honor the clickable and enabled properties in ListView.
2009-08-17 11:07:08 -07:00
Mike Lockwood
cd47012ff3 am 9dc2355b: Merge change 21492 into eclair
Merge commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8'

* commit '9dc2355b9bdfdaadb72936b5ad865193a2af58c8':
  WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:59:49 -07:00
Mike Lockwood
2b79ed839c am 56e7ba29: Merge change 21510 into eclair
Merge commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c'

* commit '56e7ba2928bce62283a62ad1c9d9f1ec7b54c24c':
  LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:59:46 -07:00
Andreas Huber
d6ba4c24aa am ffbd2426: Merge change 21340 into eclair
Merge commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5'

* commit 'ffbd2426f07474a95fefa3b2f4fe7eb4d4329af5':
  Squashed commit of the following:
2009-08-17 10:59:41 -07:00
Jeff Sharkey
32b72f7a53 am fd0d6275: Fix ExpandableListView context menus when has header views.
Merge commit 'fd0d627569cb250f7060a83161cc845b9616e5a1'

* commit 'fd0d627569cb250f7060a83161cc845b9616e5a1':
  Fix ExpandableListView context menus when has header views.
2009-08-17 10:59:35 -07:00
Amith Yamasani
4a1035508f am 7d68dae9: Merge change 21494 into eclair
Merge commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e'

* commit '7d68dae99ff2bb3c3aa066efc5b4b1d5c0cd332e':
  Allow animation styles to be applied to popup windows.
2009-08-17 10:59:30 -07:00
Grace Kloba
78eab1b141 am 86192c61: Merge change 21442 into eclair
Merge commit '86192c614c317b428e10c2dc9052a07304aa6c3f'

* commit '86192c614c317b428e10c2dc9052a07304aa6c3f':
  Fix a cookie bug. If "secure" is in the end of the string, it was ignored.
2009-08-17 10:59:21 -07:00
Mike Lockwood
5dd98cc0c3 am 6ba7ae1e: LocationManagerService: Fix null pointer check in sendExtraCommand().
Merge commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628'

* commit '6ba7ae1e4c3c04f6a71380b913ad79f83b00a628':
  LocationManagerService: Fix null pointer check in sendExtraCommand().
2009-08-17 10:59:12 -07:00
Chih-Chung Chang
f4f266cb60 am 0ff7a463: Merge change 21473 into eclair
Merge commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0'

* commit '0ff7a463ad7fe6ca7b0ab3afcf566bfdc69a00f0':
  Fix 1860351: Put datetime in jpeg exif to datetaken field.
2009-08-17 10:59:05 -07:00
Mike Lockwood
eb6ed4b4fd am 06952d92: (-s ours) DO NOT MERGE - cherry-picked from master:
Merge commit '06952d9299c23ee15df0825e75934971cfecf2ba'

* commit '06952d9299c23ee15df0825e75934971cfecf2ba':
  DO NOT MERGE - cherry-picked from master:
2009-08-17 10:59:02 -07:00
Romain Guy
621d0beb96 am 8af2d225: Merge change 21471 into eclair
Merge commit '8af2d22552c61d8d4e09e52287f056428172ab05'

* commit '8af2d22552c61d8d4e09e52287f056428172ab05':
  Add Galaxy wallpaper
2009-08-17 10:58:55 -07:00
Android (Google) Code Review
9dc2355b9b Merge change 21492 into eclair
* changes:
  WifiService: Hash based on both SSID and BSSID in scan result cache.
2009-08-17 10:47:06 -07:00
Dianne Hackborn
7341d7a104 More work on wallpapers.
- Do better about figuring out when to stop them and other related window
  management.
- Fix problem where we were not redrawing the surface when the orientation
  changed.  This was the cause of the device hang.
2009-08-17 10:42:59 -07:00
Romain Guy
dd753ae611 Honor the clickable and enabled properties in ListView. 2009-08-17 10:36:23 -07:00
Nick Pelly
a260f3f725 Update docs: readFromParcel() is not necessary to make a class support
Parcelable.
2009-08-17 10:35:49 -07:00
Android (Google) Code Review
56e7ba2928 Merge change 21510 into eclair
* changes:
  LocationManagerService: Add NullPointerException to avoid change in behavior.
2009-08-17 10:29:23 -07:00
Android (Google) Code Review
ffbd2426f0 Merge change 21340 into eclair
* changes:
  Squashed commit of the following:
2009-08-17 10:27:41 -07:00
Andreas Huber
be06d26cdc Squashed commit of the following:
commit 5bb012f0065f7ffaaeb4f569d71f0e3a8d6b19c3
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 10:40:08 2009 -0700

    An attempt at fixing export using the qcom encoders. More quirks.

commit 0690e76bfa48118a68287ccf1bbfa82febaa620c
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 09:08:28 2009 -0700

    Callbacks are now dispatched from a separate thread in OMX.

commit c6571a039526df29b6343f9a1971dbc019088c61
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 15:42:25 2009 -0700

    Massive API changes throughout stagefright, smart pointers everywhere.

commit 900612af6a0555664d9ba195112cd859491265f4
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 13:33:12 2009 -0700

    OMXCodecs now properly shutdown.

commit 96732f05e1b0603dcd1b11f16a23512592eeb4f5
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 12:04:04 2009 -0700

    More work on JPEG decoding using the hardware OMX component.

commit 63839a073ac393e3a130434ba467969053b694ad
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 12 13:13:31 2009 -0700

    An attempt to drive the JPEG decoder OMX node.

commit 3ac2fe5ab2926eda81b2123610b2434c645294ff
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:38:21 2009 -0700

    Renamed StateMachine to OMXCodec and put it in its proper place.

commit 247da75a96bf8881956413023dd49a84d5b4f5b2
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:06:19 2009 -0700

    Statemachine is now a full-fledged MediaSource.

commit 045244f6771fa0b9b329495c953afda900a84b71
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 7 09:16:54 2009 -0700

    Properly setup the input format when exporting to AMR audio.

commit 271b984cb32c5cd9e46e3f90ae121f334e4b8da9
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 6 09:59:38 2009 -0700

    Added some code to test audio encoding to the OMX harness.

commit 79af4748e4af33bd66d3fbac606e332a69741cf4
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 5 14:36:22 2009 -0700

    Merge the old OMXDecoder and the new, shiny, StateMachine code.

commit 91cf5dd77a8762bc10a0b2ffce35e3bbeb262231
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 4 17:41:43 2009 -0700

    A new harness to test OMX node compliance (and quirks).
2009-08-17 10:24:50 -07:00
Mike Lockwood
c6cc836f88 LocationManagerService: Add NullPointerException to avoid change in behavior.
After fixing a null pointer check we were no longer throwing NullPointerExceptions
which caused a CTS test to fail.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 13:16:08 -04:00