Merge commit 'd7a2f48458b5545b82ba83746753449c09c6daf1'
* commit 'd7a2f48458b5545b82ba83746753449c09c6daf1':
Display icons in the correct density in the ActivityPicker.
Merge commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef' into eclair-mr2-plus-aosp
* commit '1c96b2cd6da03f978686be572c63a6a6fd4be1ef':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a9f9031ba35433a7e009da6099b17cf603372a70' into eclair-mr2
* commit 'a9f9031ba35433a7e009da6099b17cf603372a70':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab'
* commit 'a702cab6cf99c6c2168f0662d9c15adbf76011ab':
Wifi diagnostic app to enable debug and provide information
Merge commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d' into eclair-mr2-plus-aosp
* commit '2ff62e2c7b1ecf2f4463cc8b683ea52e32337b9d':
Wifi diagnostic app to enable debug and provide information
This is the first checkin on the wifi diagnostic app. Right now,
it supports using the WifiManager API, shows the configuration details
and provides status on the supplicant, network and wifi state along with
some additional details.
More to come:
- add more API and status on any additional fields
- provide a way to show some logs
Bug: 2302130
Merge commit '1ac497b219aef7de2de4449a93666ab4ba5cb181'
* commit '1ac497b219aef7de2de4449a93666ab4ba5cb181':
Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
Merge commit 'd5f1e194a608f9985ae95c6fa061f2468b499a52'
* commit 'd5f1e194a608f9985ae95c6fa061f2468b499a52':
Display icons in the correct density in the ActivityPicker.
Merge commit 'f4b337ce10dc555ac7a1588156715af232c2be0c'
* commit 'f4b337ce10dc555ac7a1588156715af232c2be0c':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit 'af03e5f0f32d56b831bdb2c849e32af796e49306'
* commit 'af03e5f0f32d56b831bdb2c849e32af796e49306':
b/2296110 Dialog for setting up dock audio.
Merge commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250'
* commit '0f9fe5ac7112624be064a7fc5bcf6f0abe0c0250':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f' into eclair-mr2-plus-aosp
* commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f':
Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
Merge commit '267a47e683f744e4d77b9aa6aec017e5068bb443' into eclair-mr2-plus-aosp
* commit '267a47e683f744e4d77b9aa6aec017e5068bb443':
Display icons in the correct density in the ActivityPicker.
Merge commit 'a20da808f04f05cc31c50ff875ea39509790ffd4' into eclair-mr2-plus-aosp
* commit 'a20da808f04f05cc31c50ff875ea39509790ffd4':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae' into eclair-mr2-plus-aosp
* commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae':
b/2296110 Dialog for setting up dock audio.
Merge commit 'e509c36f1ed3b33da223c2f7b54372b20421d317' into eclair-mr2-plus-aosp
* commit 'e509c36f1ed3b33da223c2f7b54372b20421d317':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8' into eclair-mr2
* commit '146385663bb55d9f55ad179d3c35ccf5cac13fc8':
b/2296110 Car Dock - Enable BT if not already enabled.
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-mr2
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
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
Merge commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5' into eclair-mr2
* commit '55dc6cb99db1f9f6677dfec5a25a34e933807be5':
Disconnect even Sinks in Connecting state while connecting another sink.
Merge commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032'
* commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032':
b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324'
* commit '35b7b3fa68fd5bf01242d5763b516c5d7ad87324':
b/2293042 Fixed the problem where A2DP connections may fail if there's an existing connection to another device.
Merge commit '2ffa95fd591424ae87337078ead9693b716a9873' into eclair-mr2-plus-aosp
* commit '2ffa95fd591424ae87337078ead9693b716a9873':
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.
Merge commit '87985ae6de00f4001f957d7a27004843872a7e2a' into eclair-mr2-plus-aosp
* commit '87985ae6de00f4001f957d7a27004843872a7e2a':
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.
Merge commit '36305d01f2998396b9c49b02f6c35c76d417a048'
* commit '36305d01f2998396b9c49b02f6c35c76d417a048':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc'
* commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc':
Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'f74e344df00da63e866182cad7b6fe1cd372e779' into eclair-mr2-plus-aosp
* commit 'f74e344df00da63e866182cad7b6fe1cd372e779':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48' into eclair-mr2
* commit '9f1d9c16887d2bdebce65ceb1ac80e1fedd9ef48':
Update to reflect new priorities for A2DP profile. DO NOT MERGE.
Merge commit '1a8cb120b1a2a4df0d23831c3482a545f284ca86' into eclair-mr2-plus-aosp
* commit '1a8cb120b1a2a4df0d23831c3482a545f284ca86':
Feature #2296147 Settings for Car/Desk Dock on certain devices
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-mr2
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
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
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.
Merge commit 'e5142b7f61bdb88167cdd5877ea17dd488104814' into eclair-mr2-plus-aosp
* commit 'e5142b7f61bdb88167cdd5877ea17dd488104814':
Import revised translations. DO NOT MERGE
Merge commit '81482b04be2147bf88f96290581cc2fd2093b5a9' into eclair-mr2
* commit '81482b04be2147bf88f96290581cc2fd2093b5a9':
Import revised translations. DO NOT MERGE
