Commit Graph

38903 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
d155f6d792 am d021ea27: Merge change 27306 into eclair
Merge commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc' into eclair-plus-aosp

* commit 'd021ea27cea0ea14ad0e0295eaa51c94e92946fc':
  Modified the test case name for the browser page load test.
2009-09-27 16:54:35 -07:00
Christopher Tate
dd205d1446 am 5fbbdf2a: Merge change 27325 into eclair
Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp

* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
  Don't forget to clear "backup in progress" state when finishing a pass
2009-09-27 16:54:22 -07:00
Robert Greenwalt
fcc381b174 am fdda2746: Merge change 27304 into eclair
Merge commit 'fdda2746d83f08452953e154bdc1314544afc2bd' into eclair-plus-aosp

* commit 'fdda2746d83f08452953e154bdc1314544afc2bd':
  Fix Cdma re-start of default connection.
2009-09-27 16:53:48 -07:00
Android (Google) Code Review
4b35d699e1 Merge change 27342 into eclair
* changes:
  Don't back up / restore "allow apps from unknown sources"
2009-09-27 19:38:23 -04:00
Christopher Tate
f582a69dd2 Don't back up / restore "allow apps from unknown sources"
We no longer back up the state of the "Allow the installation of applications
from unknown sources" setting, nor do we set that based on restore data even if
it is present.

Change-Id: Ida276874616f1ff82807d642b0b733fcab339529
2009-09-27 16:36:14 -07:00
Android (Google) Code Review
d021ea27ce Merge change 27306 into eclair
* changes:
  Modified the test case name for the browser page load test.
2009-09-27 19:07:29 -04:00
Android (Google) Code Review
5fbbdf2a21 Merge change 27325 into eclair
* changes:
  Don't forget to clear "backup in progress" state when finishing a pass
2009-09-27 18:58:27 -04:00
Jack Palevich
bebf50cba7 am b44d9e15: am 056ade1b: Merge change 27203 into eclair
Merge commit 'b44d9e150a9578a1e35362119af308b674e6f5b7'

* commit 'b44d9e150a9578a1e35362119af308b674e6f5b7':
  Tighten up sample code.
2009-09-27 15:43:43 -07:00
Jack Palevich
5528fbea9c am a46c138a: am 07e0dce4: Merge change 27202 into eclair
Merge commit 'a46c138ab37e141f195d449f453dda8bd1df0947'

* commit 'a46c138ab37e141f195d449f453dda8bd1df0947':
  Check for failure to create EGL surfaces and contexts.
2009-09-27 15:43:35 -07:00
Scott Main
6a48fccce2 am dd964993: am f80e7d9c: am 60d8b780: Merge change 27064 into donut
Merge commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0'

* commit 'dd9649931fa2ce3a9fa469438cd81fc748355be0':
  docs only.
2009-09-27 15:43:20 -07:00
Robert Greenwalt
be5e37d579 am fc6cd596: am a16ca5ec: Merge change 27141 into eclair
Merge commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9'

* commit 'fc6cd59650d9f3f649dcdf5f5e23b3e089d7d5b9':
  Fix ConnectivityManager's handling of apn switch.
2009-09-27 15:43:08 -07:00
Dianne Hackborn
7fd48b2001 am e42ed5fb: am 05eeeace: Merge change 27178 into eclair
Merge commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21'

* commit 'e42ed5fb1b20fca1468ac5e704d4e49c95ffee21':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
2009-09-27 15:42:58 -07:00
Jason Sams
98bede00fe am 5b2acbfc: am 0c103af3: Merge change 27171 into eclair
Merge commit '5b2acbfcee2e424583ed69de5a94e6582b096d59'

* commit '5b2acbfcee2e424583ed69de5a94e6582b096d59':
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
2009-09-27 15:42:40 -07:00
Yu Shan Emily Lau
0a63934d97 am 20f8fcd9: am 7756cbee: Merge change 27073 into eclair
Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63'

* commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63':
  Removed the device type checking
2009-09-27 15:42:30 -07:00
Jack Palevich
7ac0e87f9b am b1d9ee62: am 2a5eea30: Merge change 27168 into eclair
Merge commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0'

* commit 'b1d9ee626694e06196b5fc7f7ea5eb99ea998eb0':
  Use EGLUtils to simplify choosing a configuration.
2009-09-27 15:42:23 -07:00
Jason Sams
c1ee427de0 am b4da1161: am aafc7b54: Merge change 27169 into eclair
Merge commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0'

* commit 'b4da1161f4a4170315a2e8332d95ceea2eb7bef0':
  Improved object lifecycle tracking and fix leaks.
2009-09-27 15:42:16 -07:00
Neel Parekh
d42a612ea9 am 1f395a21: am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though).
Merge commit '1f395a210acfa4b9d368bca4f4709dd7686cf669'

* commit '1f395a210acfa4b9d368bca4f4709dd7686cf669':
  Center name when no status.
2009-09-27 15:42:00 -07:00
Dianne Hackborn
2ecde7d9ca am 7bae17c6: am 48c84052: Merge change 27162 into eclair
Merge commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b'

* commit '7bae17c6de08a1a6416f7d0e8da8b31c0c31ff9b':
  Fix Activity.overridePendingTransition().
2009-09-27 15:41:39 -07:00
Neel Parekh
fdb8661c33 am 9a9b97d3: am 35468254: Merge change 26720 into eclair
Merge commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9'

* commit '9a9b97d3a98cff6f2a9a5bd590c113c79f3fc7c9':
  Allow us to set the contact uri without setting the fast track's uri
2009-09-27 15:41:28 -07:00
Fred Quintana
1a85cf6d77 am abd4d965: am 6ecaff15: add a optional String to the key of notifications to allow users to scope them
Merge commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58'

* commit 'abd4d965db17d8e77119da5246d5a9c367ae9c58':
  add a optional String to the key of notifications to allow users
2009-09-27 15:41:20 -07:00
Evan Millar
0c3e1ec152 am c724d2cd: am ed7f0955: Merge change 27150 into eclair
Merge commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d'

* commit 'c724d2cd198b6ef3226ed415aac349a925a85d9d':
  Fix FasttrackBadgeWidget pressed state.
2009-09-27 15:40:35 -07:00
Jason Sams
558f90b95e am 027c95d5: am f37b258c: Merge change 27146 into eclair
Merge commit '027c95d5552a1e5d34114fcdde3ff03a3ced3556'

* commit '027c95d5552a1e5d34114fcdde3ff03a3ced3556':
  Reduce debugging spew and add props to selectivly re-enable it.
2009-09-27 15:40:22 -07:00
Scott Main
03226e8612 am 1ac0247e: am ba14fff7: am 12242678: docs only. fix broken links
Merge commit '1ac0247e8b3ee92637d88f9a6186414442e2e4e8'

* commit '1ac0247e8b3ee92637d88f9a6186414442e2e4e8':
  docs only.
2009-09-27 15:40:15 -07:00
Jason Sams
f66baf4726 am f6252635: am 2896f7d6: Merge change 27137 into eclair
Merge commit 'f6252635870e83abe461943ac293a8b0b1453998'

* commit 'f6252635870e83abe461943ac293a8b0b1453998':
  Improve renderscript context teardown.  Track object in the system and then force their cleanup by releasing all user references once destroy context is called.  Java layer will no longer send destroy notifications for objects garbage collected once a context is destroyed.
2009-09-27 15:39:42 -07:00
John Wang
a4782d907c am 53e501cf: am fb2b04b7: Unhide NETWORK_TYPE_XXX.
Merge commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1'

* commit '53e501cfb3b26edd65a91ff404283de67e0bcbc1':
  Unhide NETWORK_TYPE_XXX.
2009-09-27 15:39:30 -07:00
Karl Rosaen
9042d5159e am 08fc1b50: am 0cb901c4: Merge change 27076 into eclair
Merge commit '08fc1b507c388606cf6dcb4523c8cb3766415deb'

* commit '08fc1b507c388606cf6dcb4523c8cb3766415deb':
  Optimize rotary selector widget by using bitmaps instead of drawables.
2009-09-27 15:39:18 -07:00
Wu-cheng Li
04a62d25c5 am 3af65a07: am 8de57d8f: Add camera parameter key constants and documentation.
Merge commit '3af65a075ab2c1f48da846b324a220056e5239de'

* commit '3af65a075ab2c1f48da846b324a220056e5239de':
  Add camera parameter key constants and documentation.
2009-09-27 15:38:59 -07:00
Xavier Ducrohet
d64f65997d am d7168c6b: am bd5219f5: Merge change 27106 into eclair
Merge commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1'

* commit 'd7168c6b12b325be5d91ddee0c1b6de092727ec1':
  Use reflection to figure out a readable string from install error code.
2009-09-27 15:38:39 -07:00
Dan Murphy
60ce8c2ec3 am c759ed68: fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
Merge commit 'c759ed684857a085e5cf74f5a62bc98e78abd660'

* commit 'c759ed684857a085e5cf74f5a62bc98e78abd660':
  fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting
2009-09-27 15:38:27 -07:00
Daisuke Miyakawa
a94e377c1e am d4e21df9: am 3ed05574: Merge change 27077 into eclair
Merge commit 'd4e21df96109c26a00116103567af22ff1e8f8a6'

* commit 'd4e21df96109c26a00116103567af22ff1e8f8a6':
  Two changes toward vCard composer.
2009-09-27 15:38:12 -07:00
Daniel Sandler
d33205c570 am 032b3bc9: am 228067ac: Merge change 27116 into eclair
Merge commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc'

* commit '032b3bc9a94fe7f490cb4b2e7bca3a7167465cfc':
  Fix http://b/2131173 (gaps between Gallery tiles).
2009-09-27 15:38:02 -07:00
Grace Kloba
2aa3313b6c am be3abd73: am 0f5fd893: Merge change 27052 into eclair
Merge commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8'

* commit 'be3abd73346206d7e3aeaae54a9bcace3b5f8ee8':
  If WebCore doesn't response touch down in time, don't
2009-09-27 15:37:39 -07:00
johnwang
90e09bd784 am f7760124: am 9c118c80: Update CID in NeighboringCellInfo
Merge commit 'f7760124264099a9c4b0aa6e03392816ceb81c7f'

* commit 'f7760124264099a9c4b0aa6e03392816ceb81c7f':
  Update CID in NeighboringCellInfo
2009-09-27 15:37:32 -07:00
Mike Lockwood
90f07ba37e am 7833c22d: Merge change 27039 into eclair
Merge commit '7833c22d43dc5abbbfff500b641e31897996d265'

* commit '7833c22d43dc5abbbfff500b641e31897996d265':
  Fix volume key handling when in-call and screen is off due to proximity sensor.
2009-09-27 15:36:28 -07:00
David 'Digit' Turner
4e86332651 am 6c52fdb6: am a0cad2f5: Merge change 27078 into eclair
Merge commit '6c52fdb684740a7ee86a743cacc701d9db24e8da'

* commit '6c52fdb684740a7ee86a743cacc701d9db24e8da':
  Fix generic build boot sequence.
2009-09-27 15:36:24 -07:00
Christopher Tate
a253f16cf8 Don't forget to clear "backup in progress" state when finishing a pass
If a backup pass had been skipped (either because the transport was unavailable
or -- in a common case! -- because there was simply no work pending when the
periodic backup check fired), we were forgetting to reset the "backup currently
in progress" flag.  Once we'd done that, the device would *NEVER* perform a
backup until it was rebooted, since it would forever think that there was one
currently in operation that must not be interfered with.

Change-Id: I0d6d7375dc6de99b599222a449934e70fe13ebb9
2009-09-27 15:16:44 -07:00
Android (Google) Code Review
fdda2746d8 Merge change 27304 into eclair
* changes:
  Fix Cdma re-start of default connection.
2009-09-27 18:10:28 -04:00
Grace Kloba
aecb8a007c am e02e8b9c: Merge change 27315 into eclair
Merge commit 'e02e8b9c11231d99aacd5fda31042168650edd49' into eclair-plus-aosp

* commit 'e02e8b9c11231d99aacd5fda31042168650edd49':
  Reset mPreventDrag at touch_down.
2009-09-27 15:09:30 -07:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Android (Google) Code Review
e02e8b9c11 Merge change 27315 into eclair
* changes:
  Reset mPreventDrag at touch_down.
2009-09-27 18:04:13 -04:00
Robert Greenwalt
e436d46e57 Fix Cdma re-start of default connection.
We dropped an onTrySetupData call because onEnableNewApn calls that automatically on GSM,
but CDMA was not doing anything.  Made CDMA simply call onTrySetupData.

Also, isApnTypeActive for CDMA was returning true even when no data was working.  Changed
to report true when initing or connected, like GSM.
2009-09-27 14:55:37 -07:00
Wei Huang
98b050d067 am fbb72631: add new column "real_date" for IM messages table.
Merge commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb' into eclair-plus-aosp

* commit 'fbb7263121923cd30d52ac4a35c4309b0a618ddb':
  add new column "real_date" for IM messages table.
2009-09-27 14:55:12 -07:00
Grace Kloba
d66d84ffa2 Reset mPreventDrag at touch_down.
Check the delta for short press case as we may switch to
PREVENT_DRAG_NO at SWITCH_TO_SHORTPRESS.

This should fix another two corner cases where flick doesn't
do anything.
2009-09-27 14:53:45 -07:00
Wei Huang
fbb7263121 add new column "real_date" for IM messages table.
Change-Id: I5c4b3da0843ff0205c2aff5f89639aba47a84e3b
2009-09-27 14:46:20 -07:00
Yu Shan Emily Lau
30412d1ce0 Modified the test case name for the browser page load test. 2009-09-27 14:14:10 -07:00
Wei Huang
7df612ceb9 am 6a07f9fb: Merge change 27301 into eclair
Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp

* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
  bug 2148061: if PduBody is zero length, treat it as an empty message.
2009-09-27 14:12:56 -07:00
Android (Google) Code Review
6a07f9fbe9 Merge change 27301 into eclair
* changes:
  bug 2148061: if PduBody is zero length, treat it as an empty message.
2009-09-27 17:04:44 -04:00
Dianne Hackborn
a1414d1c5b am ac939d08: Merge change 27291 into eclair
Merge commit 'ac939d086c42afeaef0982cee0e5861184dd82eb' into eclair-plus-aosp

* commit 'ac939d086c42afeaef0982cee0e5861184dd82eb':
  Fix issue #2148939: Sholes slow to wake up in landscape mode
2009-09-27 14:03:37 -07:00
Ray Chen
1055e0d830 am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
2009-09-27 14:03:32 -07:00
Android (Google) Code Review
ac939d086c Merge change 27291 into eclair
* changes:
  Fix issue #2148939: Sholes slow to wake up in landscape mode
2009-09-27 17:00:20 -04:00