Commit Graph

845 Commits

Author SHA1 Message Date
Michael Chan
8c98fc0a35 am af03e5f0: am 41eb3841: am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit 'af03e5f0f32d56b831bdb2c849e32af796e49306'

* commit 'af03e5f0f32d56b831bdb2c849e32af796e49306':
  b/2296110 Dialog for setting up dock audio.
2009-12-10 06:59:02 -08:00
Jaikumar Ganesh
ece711b124 am 0f9fe5ac: am e509c36f: am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250'

* commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250':
  Disconnect even Sinks in Connecting state while connecting another sink.
2009-12-10 06:58:58 -08:00
Android (Google) Code Review
613549a622 Merge change I2c3621d1 into eclair
* changes:
  Fix desk dock getting stuck after unpairing.
2009-12-10 02:44:12 -08:00
Android (Google) Code Review
d1469da150 Merge change I10036c49 into eclair
* changes:
  b/2296110 Disable debugging/logging code before shipping.
2009-12-10 02:41:41 -08:00
Jaikumar Ganesh
b172cd5d23 Fix desk dock getting stuck after unpairing.
Note: This is a workaround. The read problem is that
we are making a call to Bluez when it is not ready yet.
The interface has not been registered, so dbus call should fail.
We need to fix this properly.

Dr No: Eastham
Bug: 2317784
2009-12-10 02:02:47 -08:00
Android (Google) Code Review
d6e36463ea Merge change Ib5077943 into eclair-mr2
* changes:
  Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
2009-12-09 23:23:49 -08:00
Jaikumar Ganesh
6e3ee10a99 Fix auto connection of A2DP profile.
When the user selects profiles from the UI, set priority to ON.

Dr No: Eastham
Bug: 2317323
2009-12-09 19:15:30 -08:00
Michael Chan
6fd5bc935e b/2296110 Disable debugging/logging code before shipping.
Change-Id: I10036c49e3c3d61d0fa1af74f1f0cd9d03502103
2009-12-09 18:00:48 -08:00
Android (Google) Code Review
d70e205b4c Merge change I724fc8fd into eclair
* changes:
  b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
2009-12-09 17:45:07 -08:00
Android (Google) Code Review
1d5f14bd54 Merge change I92124d28 into eclair
* changes:
  b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
2009-12-09 17:45:03 -08:00
Android (Google) Code Review
488a80a7b1 Merge change Id587a517 into eclair
* changes:
  b/2314560 Prevent PIN dialog from showing up on undocked docks
2009-12-09 17:44:53 -08:00
Michael Chan
792edfcf12 b/2317194 Synchronize command queue to prevent ConcurrentModificationException from happening
Change-Id: I724fc8fd07d33cfa6e68221a766754dcb1f6aeba
2009-12-09 17:34:54 -08:00
Michael Chan
503c236db5 b/2296110 Car Dock - Stop service when done processing each command. Clean up logs.
Change-Id: I92124d2856e6c825a2b4148473431789a1f5b156
2009-12-09 17:27:56 -08:00
Michael Chan
d617a0781c b/2314560 Prevent PIN dialog from showing up on undocked docks
If unpaired while undocked, device will be removed from the BT device list.
If unpaired while docked, the user can do pair and connect. No PIN dialog will pop up.
If undocked after unpaired, device will be removed from the BT device list.

Change-Id: Id587a517999e08641451f78dec8696a06028cf16
2009-12-09 17:16:46 -08:00
Romain Guy
a9f9031ba3 Display icons in the correct density in the ActivityPicker.
This also fixes a memory leak in Home.

Do not merge.

Change-Id: Ib69b4055fae2c8705887bbd12be7fa61b689eb03
2009-12-09 15:20:46 -08:00
Romain Guy
267a47e683 Display icons in the correct density in the ActivityPicker. 2009-12-09 12:17:33 -08:00
Bjorn Bringert
7be5137e12 Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
Fixes http://b/issue?id=2315370

Change-Id: Ib5077943f40e66f1d6d4121416d0a36f7bdcfc9d
2009-12-09 14:43:50 +00:00
Michael Chan
a20da808f0 am 14638566: b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-mr2

* commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8':
  b/2296110 Car Dock - Enable BT if not already enabled.
2009-12-08 14:22:17 -08:00
Michael Chan
146385663b b/2296110 Car Dock - Enable BT if not already enabled.
Change-Id: If1798f62c9438e58c342869176437067f941c8cb
2009-12-08 14:18:13 -08:00
Michael Chan
41eb38412a am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2

* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
  b/2296110 Dialog for setting up dock audio.
2009-12-07 20:50:32 -08:00
Android (Google) Code Review
0c75b2d2dc Merge change I80790bdb into eclair
* changes:
  b/2296110 Dialog for setting up dock audio.
2009-12-07 20:48:16 -08:00
Michael Chan
df9504ef58 b/2296110 Dialog for setting up dock audio.
Reimplemented as a Foreground Service just so it can get on top of the Car Dock App.
Added debounce mechanism to not disconnect immediately after getting a undock event.
Each dock now has its own "Remember setting".
Remember Settings is on by default

Change-Id: I80790bdb7c831e2a642365b92433012191aa70c1
2009-12-07 16:57:26 -08:00
Jaikumar Ganesh
e509c36f1e am 55dc6cb9: Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-mr2

* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
  Disconnect even Sinks in Connecting state while connecting another sink.
2009-12-07 15:52:53 -08:00
Jaikumar Ganesh
55dc6cb99d Disconnect even Sinks in Connecting state while connecting another sink.
We can hit this more when using a Car Dock

Bug: 2133530
Dr No: Eastham
2009-12-07 15:22:50 -08:00
Michael Chan
a7703377da am a11c5723: am 2ffa95fd: am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032'

* commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032':
  b/2296110 New Dialog which appears when phone is place on dock.
2009-12-04 04:32:44 -08:00
Michael Chan
117d5bedff am 35b7b3fa: am 87985ae6: am 3327f788: b/2293042 Fixed the problem where A2DP connections may fail if there\'s an existing connection to another device.
Merge commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324'

* commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324':
  b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
2009-12-04 04:24:57 -08:00
Michael Chan
2ffa95fd59 am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2

* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
  b/2296110 New Dialog which appears when phone is place on dock.
2009-12-03 20:44:45 -08:00
Michael Chan
0bd445b974 b/2296110 New Dialog which appears when phone is place on dock.
Change-Id: I58b216ee9b4ca9ce16210309358c0512271e128e
2009-12-03 20:32:38 -08:00
Michael Chan
87985ae6de am 3327f788: b/2293042 Fixed the problem where A2DP connections may fail if there\'s an existing connection to another device.
Merge commit '3327f7887328c55ef2d837a8e2a07cea2070c744' into eclair-mr2

* commit '3327f7887328c55ef2d837a8e2a07cea2070c744':
  b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
2009-12-03 12:23:17 -08:00
Michael Chan
3327f78873 b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Change-Id: I1b4963a167b633c0905e2719ab3f651ff8be9f2c
2009-12-03 11:45:59 -08:00
Amith Yamasani
534a734cfa am b6d5b264: am 1a8cb120: am e2caf2ee: Merge change I82be95f6 into eclair
Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc'

* commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc':
  Feature #2296147	Settings for Car/Desk Dock on certain devices
2009-12-02 20:41:10 -08:00
Amith Yamasani
6ff54fce09 am 1b305084: am 379953de: am 8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '1b305084946df160b801596615b6e5090d70fa2e'

* commit '1b305084946df160b801596615b6e5090d70fa2e':
  Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
2009-12-02 20:26:49 -08:00
Android (Google) Code Review
9f1d9c1688 Merge change I9a1ed7e4 into eclair
* changes:
  Update to reflect new priorities for A2DP profile. DO NOT MERGE.
2009-12-02 16:02:52 -08:00
Amith Yamasani
1a8cb120b1 am e2caf2ee: Merge change I82be95f6 into eclair
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2

* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
  Feature #2296147	Settings for Car/Desk Dock on certain devices
2009-12-02 15:47:19 -08:00
Jaikumar Ganesh
9a1ed7e4e6 Update to reflect new priorities for A2DP profile. DO NOT MERGE.
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.

When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.

Change priority for Headset profile on the same lines as A2DP profile.

AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.

Dr no: Eastham
Bug: 2133530
2009-12-02 15:38:52 -08:00
Amith Yamasani
d2b3ab088f Feature #2296147 Settings for Car/Desk Dock on certain devices
This inserts a launcher for the Dock settings dialog, if the
device supports it and is currently docked.
The menu item disappears if the phone is not docked in the car/desk dock.
2009-12-02 15:36:34 -08:00
Amith Yamasani
379953def1 am 8f2fb65b: Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2

* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
  Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
2009-12-02 09:50:05 -08:00
Amith Yamasani
8f2fb65b36 Setting in Sound & Display for trackball pulsing on notification. Bug #2238250 2009-12-01 19:06:14 -08:00
Irfan Sheriff
5babd80402 am a8eae3f3: am 60e57143: Missing Forget button after doing Add Network on an AP in the scanned list
Merge commit 'a8eae3f387380b8270e259284b3944b8d0388573'

* commit 'a8eae3f387380b8270e259284b3944b8d0388573':
  Missing Forget button after doing Add Network on an AP in the scanned list
2009-12-01 17:31:33 -08:00
Jaikumar Ganesh
5534ab1fb0 am fe0540c2: am 6c01d130: Merge change I42499a85 into eclair-mr2
Merge commit 'fe0540c26d661eb56e7693e47189039326e19f72'

* commit 'fe0540c26d661eb56e7693e47189039326e19f72':
  Change priority for Headset profile on the same lines as A2DP profile.
2009-12-01 17:31:29 -08:00
Irfan Sheriff
60e5714311 Missing Forget button after doing Add Network on an AP in the scanned list
Problem:

On the Wifi Settings screen, if instead of clicking on the AP shown on the scanned list, we do an "Add Wi-Fi network" and enter the AP information - the AP information gets stored and the client device connects to the AP. Afterwards, if we click on the AP again the "Forget" button does not appear until we exit the Wifi Settings screen and return.

Root cause and Fix:
mApScanList in WifiLayer tracks the list of APs shown. Upon doing a connect through a direct click, the configured state for the AP in the list updated. However, if we do an Add Network, the configured state on mApScanList remains unupdated. This causes the Settings screen to not show "Forget" for the AP when it is clicked.

The fix is to set the Configured state to true in handleSave() by fetching the AP state stored in WifiLayer.

Bug: 2296038
Change-id: I70c545905a4984a03a0f235f3baf17cd36688710
2009-12-01 16:56:39 -08:00
Jaikumar Ganesh
42499a85e8 Change priority for Headset profile on the same lines as A2DP profile.
AUTO_CONNECT => we auto_connect.
ON => Settings app box is checked and we allow incoming connections.
OFF => Settings app check box is unchecked.
2009-11-30 10:32:27 -08:00
Jaikumar Ganesh
57abf4ba8c am 8a8da556: am 210667f3: Update to reflect new priorities for A2DP profile.
Merge commit '8a8da556f3b9750263f3c447c88fa81bd50fe845'

* commit '8a8da556f3b9750263f3c447c88fa81bd50fe845':
  Update to reflect new priorities for A2DP profile.
2009-11-25 15:45:26 -08:00
Jaikumar Ganesh
210667f353 Update to reflect new priorities for A2DP profile.
1. PRIORITY_OFF is when it is unchecked.
2. PRIORITY_ON is when it is checked.
3. PRIORITY_AUTO_CONNECT is when we want to auto connect.

When the box is checked, we want to auto connect,
so set the priority to AUTO_CONNECT.
When the user disconnects, we set the priority back
to PRIORITY_ON.
2009-11-24 14:43:45 -08:00
Oscar Montemayor
8877f74901 Encrypted File Systems Project. Enabling Settings menu changes to transition to EFS mode.
Menu interface changes only. Does not affect operatio forthe rest of the system.
2009-11-16 17:18:58 -08:00
Charles Chen
05b08a50f8 Adding a prompt to help users download Talkback
(Google's open source screen reader) if they go
to the Accessibility settings screen and do not
have any accessibility tools installed.

This is a fix for bug #2250279
2009-11-16 15:28:31 -08:00
Amith Yamasani
eba00ec701 am a79239b1: Merge change I2d844842 into eclair
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-mr2

* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
  Fix for NPE in #2248683
2009-11-11 19:20:33 -08:00
Android (Google) Code Review
a79239b102 Merge change I2d844842 into eclair
* changes:
  Fix for NPE in #2248683
2009-11-11 19:15:47 -08:00
Amith Yamasani
f6b384045d Fix for NPE in #2248683
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
2009-11-11 19:03:09 -08:00
Michael Chan
4fcf94c47b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 11:06:36 -08:00