Commit Graph

3710 Commits

Author SHA1 Message Date
Grace Kloba
ff9af3f3ee am 9d33d953: Merge change I07729abd into eclair
Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp

* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
  Keep the scrollbar on during TOUCH_MOVE events even
2009-09-30 21:48:02 -07:00
Android (Google) Code Review
9d33d953a0 Merge change I07729abd into eclair
* changes:
  Keep the scrollbar on during TOUCH_MOVE events even when there is no movement.
2009-10-01 00:41:21 -04:00
Fred Quintana
d5aa602861 am c868acf4: show events in the UI
Merge commit 'c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp

* commit 'c868acf442a69429056a574c67a5e0187e2b9536':
  show events in the UI
2009-09-30 21:38:23 -07:00
Fred Quintana
c868acf442 show events in the UI 2009-09-30 21:29:33 -07:00
Jaikumar Ganesh
eff77e9a92 am 8ad6d524: Merge change I55e15bad into eclair
Merge commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28' into eclair-plus-aosp

* commit '8ad6d524e48d88ff9d5606cea0df56b4c1dafe28':
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-09-30 21:19:46 -07:00
Evan Millar
eebbe04fdc am 35de7ef8: Merge change I98f2db38 into eclair
Merge commit '35de7ef84380975a229d5b984b63da23871738db' into eclair-plus-aosp

* commit '35de7ef84380975a229d5b984b63da23871738db':
  FastTrack->QuickContact
2009-09-30 21:19:38 -07:00
Grace Kloba
271fcd4ac9 am ade1aacf: Merge change Ic88b39e6 into eclair
Merge commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065' into eclair-plus-aosp

* commit 'ade1aacf4cb9a43b85f0c70b145b42127c54f065':
  Add the signature checking for WebView plugins. The
2009-09-30 21:17:58 -07:00
Wu-cheng Li
2b3489ddad am 5e5001bc: Merge change I7ed72bf5 into eclair
Merge commit '5e5001bc1a065f6d578b953b908052d623272fcd' into eclair-plus-aosp

* commit '5e5001bc1a065f6d578b953b908052d623272fcd':
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-09-30 21:17:01 -07:00
Eric Fischer
1dc38caf5f am 88f2acb0: Merge change Iec1f8a2e into eclair
Merge commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37' into eclair-plus-aosp

* commit '88f2acb066f2b66a01807ad4f3d26ef575a1bf37':
  Add Turkish accented letters for G and S on the hard keyboard.
2009-09-30 21:15:06 -07:00
Jaikumar Ganesh
d709d38205 am 4c9a29ef: Set Sink State when ACL disconnects.
Merge commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea' into eclair-plus-aosp

* commit '4c9a29efdbf58034c1d90eb001dc7299f1f012ea':
  Set Sink State when ACL disconnects.
2009-09-30 21:14:41 -07:00
Christopher Tate
6678aeccec am 436344ae: Turn off most of the backup-related debug logging
Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp

* commit '436344ae12c819f58306ceb94241a266141e1218':
  Turn off most of the backup-related debug logging
2009-09-30 21:13:34 -07:00
Leon Scroggins
782d690fbd am 10be7542: If the textfield is offscreen at the end of a zoom, remove it.
Merge commit '10be7542327e1d4483b33730164e5404ed48d73e' into eclair-plus-aosp

* commit '10be7542327e1d4483b33730164e5404ed48d73e':
  If the textfield is offscreen at the end of a zoom, remove it.
2009-09-30 21:12:02 -07:00
Android (Google) Code Review
8ad6d524e4 Merge change I55e15bad into eclair
* changes:
  Try to reconnect twice when the rfcomm error code is Connection Refused.
2009-10-01 00:00:17 -04:00
Android (Google) Code Review
35de7ef843 Merge change I98f2db38 into eclair
* changes:
  FastTrack->QuickContact
2009-10-01 00:00:07 -04:00
Grace Kloba
5b2c056a3f Keep the scrollbar on during TOUCH_MOVE events even
when there is no movement.

Fix http://b/issue?id=2151115
2009-09-30 20:43:24 -07:00
Evan Millar
e3ec9977bb FastTrack->QuickContact
Change-Id: I98f2db38e6402bdbe47b941d82c8f33863d1863e
2009-09-30 20:33:17 -07:00
Android (Google) Code Review
ade1aacf4c Merge change Ic88b39e6 into eclair
* changes:
  Add the signature checking for WebView plugins. The first one is for SampleBrowserPlugin. The second one is for Flash.
2009-09-30 23:17:17 -04:00
Grace Kloba
73477e7336 Add the signature checking for WebView plugins. The
first one is for SampleBrowserPlugin. The second
one is for Flash.
2009-09-30 20:14:26 -07:00
Android (Google) Code Review
5e5001bc1a Merge change I7ed72bf5 into eclair
* changes:
  Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-09-30 22:48:02 -04:00
Wu-cheng Li
2988ab7c32 Add documentation for scene mode. Other parameters may be changed after setting scene mode. 2009-09-30 19:44:58 -07:00
Android (Google) Code Review
88f2acb066 Merge change Iec1f8a2e into eclair
* changes:
  Add Turkish accented letters for G and S on the hard keyboard.
2009-09-30 21:06:56 -04:00
Eric Fischer
ec1f8a2ece Add Turkish accented letters for G and S on the hard keyboard.
Bug 2158331
2009-09-30 18:03:47 -07:00
Jaikumar Ganesh
4c9a29efdb Set Sink State when ACL disconnects.
Change-Id: I9c71c1b848da48883c8ce28503c53c7d32e2fa34
2009-09-30 17:46:17 -07:00
Jaikumar Ganesh
54172d92af Try to reconnect twice when the rfcomm error code is Connection Refused.
This happens when the the remote headset is in a bad state or is
not accepting connections. Try twice before giving up.

Change-Id: I55e15bad6b72904b8e4ccbca89e17e9bd3ddb61e
2009-09-30 17:46:17 -07:00
Christopher Tate
436344ae12 Turn off most of the backup-related debug logging
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.

Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
2009-09-30 17:07:37 -07:00
Nick Pelly
05c776477c am 78128d72: Merge change I2782ac8c into eclair
Merge commit '78128d721cdff2e035eab5da72819520f88affaf' into eclair-plus-aosp

* commit '78128d721cdff2e035eab5da72819520f88affaf':
  Fix regression.
2009-09-30 16:23:53 -07:00
Suchi Amalapurapu
7a51b14d9f am 094e3e0b: Merge change Icb89d482 into eclair
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp

* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
  Check if rename of backed up file fails before persisting new changes.
2009-09-30 16:23:45 -07:00
Leon Scroggins
10be754232 If the textfield is offscreen at the end of a zoom, remove it.
Fixes http://b/issue?id=2147168

Change-Id: I068746f7a7242bab5bc2116598f0421d7385ce25
2009-09-30 19:03:31 -04:00
Android (Google) Code Review
78128d721c Merge change I2782ac8c into eclair
* changes:
  Fix regression.
2009-09-30 18:38:55 -04:00
Android (Google) Code Review
094e3e0bcc Merge change Icb89d482 into eclair
* changes:
  Check if rename of backed up file fails before persisting new changes. If not these system services will end up with inconsistent settings files when the device runs out of storage. Delete mangled settings file in PackageManager if the current write fails so that we don't end up overwriting the backed up version with the mangled version Include null check when retrieving fwd locked resource for an existing package
2009-09-30 18:37:45 -04:00
Suchi Amalapurapu
8550f25523 Check if rename of backed up file fails before persisting new changes.
If not these system services will end up with inconsistent settings files
when the device runs out of storage.
Delete mangled settings file in PackageManager if the current write fails
so that we don't end up overwriting the backed up version with the
mangled version
Include null check when retrieving fwd locked resource for an existing package
2009-09-30 15:36:29 -07:00
Nick Pelly
62895a67d2 Fix regression.
When turning off BT while connected to an A2DP/HFP headset we can hit the path

BluetoothHeadsetService.onReceive(BluetoothHeadset.STATE_CHANGED) ->
BluetoothHandsfree.audioOff() ->
BluetoothA2dp.resumeSink() ->
which causes resumeSink() to NPE because mAudioDevices.get() returns null.

It's a race between A2DP marking the device as disconnected, and HFP marking
the device as disconnected.

Fix is to NPE check in resumeSink().

Change-Id: I2782ac8c70ea1678d7de5fcd49bff8e03df36f4e
2009-09-30 15:30:43 -07:00
Jaikumar Ganesh
9d2dc89cc3 am b392c53f: Merge change Iba6fd660 into eclair
Merge commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a' into eclair-plus-aosp

* commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a':
  Set BondState to Bonding only if it not Bonded already.
2009-09-30 15:29:00 -07:00
Android (Google) Code Review
b392c53f1f Merge change Iba6fd660 into eclair
* changes:
  Set BondState to Bonding only if it not Bonded already.
2009-09-30 18:22:46 -04:00
Dianne Hackborn
e67de07627 am a33e3f79: Fix issue #2154794: Force close when start facebook application.
Merge commit 'a33e3f79259b56b03c7912af35944f34ad190e3c' into eclair-plus-aosp

* commit 'a33e3f79259b56b03c7912af35944f34ad190e3c':
  Fix issue #2154794: Force close when start facebook application.
2009-09-30 15:20:10 -07:00
Dianne Hackborn
a33e3f7925 Fix issue #2154794: Force close when start facebook application.
I think when we were scanning the updated app in the system image,
from an older version on the data partition, we were not setting
the existing package to have the system flag, so not auto-granting
any new permissions.

This also includes some other cleanup in the package manager to
remove old files in various places, and tighten up logging.

Also similar logging cleanup elsewhere.

Change-Id: I6d113c7cf7e736ab9be512d6d7c94c806a24199a
2009-09-30 15:09:33 -07:00
Dianne Hackborn
04e8a925c0 am 935cbda0: Merge change I174d16a3 into eclair
Merge commit '935cbda0df2d55247c30d65534ecf31b1ee164b5' into eclair-plus-aosp

* commit '935cbda0df2d55247c30d65534ecf31b1ee164b5':
  Debugging for #2027266: app drawer showing up on the side
2009-09-30 14:41:59 -07:00
Scott Main
3f8e158a9d am d2c494d9: Merge change I8b2e000c into eclair
Merge commit 'd2c494d9be366aed081742c097b97816a6ed9d44' into eclair-plus-aosp

* commit 'd2c494d9be366aed081742c097b97816a6ed9d44':
  add class description and revise descriptions for
2009-09-30 14:41:51 -07:00
Android (Google) Code Review
935cbda0df Merge change I174d16a3 into eclair
* changes:
  Debugging for #2027266: app drawer showing up on the side
2009-09-30 17:36:07 -04:00
Android (Google) Code Review
d2c494d9be Merge change I8b2e000c into eclair
* changes:
  add class description and revise descriptions for get*Drawable and peek*Drawable methods for clarity. also fix some links.
2009-09-30 17:32:01 -04:00
Daisuke Miyakawa
dfe07a850b am 0100fae1: Merge change I1f7c409e into eclair
Merge commit '0100fae14ff12c36eeff07b94cdea5f8756837aa' into eclair-plus-aosp

* commit '0100fae14ff12c36eeff07b94cdea5f8756837aa':
  Make ContactStruct handle Collection properly.
2009-09-30 14:31:15 -07:00
Amith Yamasani
e092e1f531 am 17d262f2: Merge change I69220990 into eclair
Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp

* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
2009-09-30 14:31:02 -07:00
Dianne Hackborn
dc6b635cfa Debugging for #2027266: app drawer showing up on the side
Nothing fixed, but this tells us what is going on.

Change-Id: I174d16a3864af2fa235e8cc7b1e74d32a375fb42
2009-09-30 14:28:16 -07:00
Android (Google) Code Review
0100fae14f Merge change I1f7c409e into eclair
* changes:
  Make ContactStruct handle Collection properly.
2009-09-30 17:27:09 -04:00
Daisuke Miyakawa
1f7c409edc Make ContactStruct handle Collection properly.
Internal Issue number: 2157922
2009-09-30 14:25:48 -07:00
Android (Google) Code Review
17d262f232 Merge change I69220990 into eclair
* changes:
  Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
2009-09-30 17:22:33 -04:00
Megha Joshi
e8501c84f8 am 523db1c3: Merge change Icf1e2f98 into eclair
Merge commit '523db1c33580f453fd5abd74bede3e0e3e46a825' into eclair-plus-aosp

* commit '523db1c33580f453fd5abd74bede3e0e3e46a825':
  Adds Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to launch fasttrack intent.
2009-09-30 14:20:55 -07:00
Android (Google) Code Review
523db1c335 Merge change Icf1e2f98 into eclair
* changes:
  Adds Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET to launch fasttrack intent.
2009-09-30 17:15:54 -04:00
Amith Yamasani
bae6fc2447 Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
This introduces problems when scrolling through preference screens, due
to a clash in this cache versus the ListView's cache.

This reverts commit 01dbc2ed55.
2009-09-30 14:11:57 -07:00
Jaikumar Ganesh
37686069ae Set BondState to Bonding only if it not Bonded already.
Sometimes we might be paired but the other end might not have stored the link
key. So when we initiate connection the other end will ask for the authorization.
This was setting out Bond State to Bonding.

Change-Id: Iba6fd660ac90a3f48da62e7b6cf479054624a5af
2009-09-30 14:02:36 -07:00