12051 Commits

Author SHA1 Message Date
Eric Fischer
7778173a32 am 70f1a3b8: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c' into gingerbread-plus-aosp

* commit '70f1a3b8a0fcf332e35f87be85ae3a9e37a85e9c':
  Import revised translations.  DO NOT MERGE
2010-10-07 07:16:56 -07:00
Dianne Hackborn
55f1b0b82f am 9d6824cd: Merge "Make Activity.removeDialog() less strict." into gingerbread
Merge commit '9d6824cd53960b4562ea3c55876b40ca21710050' into gingerbread-plus-aosp

* commit '9d6824cd53960b4562ea3c55876b40ca21710050':
  Make Activity.removeDialog() less strict.
2010-10-07 07:16:34 -07:00
Kenny Root
36455d0325 am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread
Merge commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed' into gingerbread-plus-aosp

* commit 'a3ee5c0351e51f7a978ddddc37644f46051ca6ed':
  Add MountService tests and fix a bug it found
2010-10-07 07:16:08 -07:00
Dianne Hackborn
e89bf50261 am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread
Merge commit 'ef083ec008a3ec69180340912e7f0137472c97d9' into gingerbread-plus-aosp

* commit 'ef083ec008a3ec69180340912e7f0137472c97d9':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
2010-10-07 07:15:57 -07:00
Gilles Debunne
f960718c1c am 1ae32bfe: New assets for buttons and notification
Merge commit '1ae32bfebf5102774cbf6424885f84e4630925c4' into gingerbread-plus-aosp

* commit '1ae32bfebf5102774cbf6424885f84e4630925c4':
  New assets for buttons and notification
2010-10-07 07:15:05 -07:00
Eric Fischer
70f1a3b8a0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-10-06 17:32:17 -07:00
Dianne Hackborn
9d6824cd53 Merge "Make Activity.removeDialog() less strict." into gingerbread 2010-10-06 17:26:16 -07:00
Eric Fischer
3d1841c788 Import revised translations. DO NOT MERGE
Change-Id: Id9a7d2da704ed4d37efa8646815835fc6a7c5473
2010-10-06 17:11:06 -07:00
Dianne Hackborn
d2ce8bbb84 Make Activity.removeDialog() less strict.
It was extremely annoying not being able to do this.

Change-Id: I9a13b4fdd984a5e9d8f9ac49c7ede218c4481c2b
2010-10-06 17:09:47 -07:00
Kenny Root
a3ee5c0351 Merge "Add MountService tests and fix a bug it found" into gingerbread 2010-10-06 16:59:23 -07:00
Dianne Hackborn
ef083ec008 Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 2010-10-06 16:56:02 -07:00
Kenny Root
17eb6fb07c Add MountService tests and fix a bug it found
Add some MountService tests that are based partially on some stuff done
in PackageManagerTests. This allows us to test the OBB changes in an
easy way.

Also, it found some bugs in the DefaultContainerService connection state
machine, so fix those while we're at it.

Change-Id: I18f38593be754eb32fb6e842f88eec47e2beefce
2010-10-06 15:39:28 -07:00
Gilles Debunne
1ae32bfebf New assets for buttons and notification
Change-Id: I95ffa7600476f97e3be3c577ef55855abeaeac5e
2010-10-06 14:32:29 -07:00
Dianne Hackborn
043fcd9847 Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
Exposes an Intent I need (okay it fixes an unrelated thing in the power widget),
and fixes some dump output.

Change-Id: I51d6c93a6ac879bab64e9d5aa21129e2bbcd461b
2010-10-06 14:27:34 -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
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
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
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
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
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
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
Brett Chabot
b9a40068b5 Merge "Failing test cleanup." into gingerbread 2010-10-05 11:00:07 -07: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
Mathias Agopian
722665c5f7 am ef115308: fix build. SurfaceView.setFrame needed to be hidden
Merge commit 'ef11530874f86570aa04a10c16a416b274b3fdf5' into gingerbread-plus-aosp

* commit 'ef11530874f86570aa04a10c16a416b274b3fdf5':
  fix build. SurfaceView.setFrame needed to be hidden
2010-10-04 20:18:51 -07:00
Mathias Agopian
ef11530874 fix build. SurfaceView.setFrame needed to be hidden
Change-Id: I96b0896e24483e9b5db19c938cb6058868f34e48
2010-10-04 20:15:08 -07:00
Adam Powell
815b1eb870 am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp

* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
  Fix bug 3061769
2010-10-04 19:59:35 -07:00
Adam Powell
1c2911a648 Merge "Fix bug 3061769" into gingerbread 2010-10-04 19:56:49 -07:00
Brett Chabot
2ad24f944e Failing test cleanup.
Change-Id: I7cabc6ff2ec1fcb80dede5da03b03622a5bae021
2010-10-04 19:55:14 -07:00
Mathias Agopian
b99e81ab4c am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread
Merge commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3' into gingerbread-plus-aosp

* commit '7e6064ad7ccd4a0c59d89ccdf16e969b0c3296d3':
  fix [3008290] passion GB surface does not send surfaceChanged notification after size change.
2010-10-04 19:52:41 -07:00
Mathias Agopian
7e6064ad7c Merge "fix [3008290] passion GB surface does not send surfaceChanged notification after size change." into gingerbread 2010-10-04 19:50:16 -07:00
Dianne Hackborn
54e570f78b Make it easier to figure out whether an app can go on sd card.
Change-Id: I9195a0881b2c435b138f39c2ab1505dc820caf10
2010-10-04 18:35:10 -07:00
Nick Pelly
c7bfb13fd9 am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp

* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
  New API stubs: NdefMessage and NdefRecord.
2010-10-04 18:27:27 -07:00