Bug:2362077 Bug:2312836 Bug:2166486
Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
Merge commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8'
* commit '39c3d10bfccd74b26b045e3d6a712d282fba88d8':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Merge commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df'
* commit '3b7ffa5eeff9fddbbfdf3c8bdff4b19b1eb7a4df':
Strings for new Dock settings screen, to get started on the L10N.
Merge commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a' into eclair-plus-aosp
* commit '0e2ab4f884e549d7fb21d0227bf5ee61f9f7958a':
New top-level Dock in Settings and a Dock Settings screen with Audio item. #2367275
Add a new top-level setting for car/desktop dock settings.
Sub menu contains one item - Audio (settings)
Sub text for Audio shows current docked status and launches either the
audio settings or a dialog saying that you're not docked and you need to
buy a new dock from Google (kidding).
Merge commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156' into eclair-plus-aosp
* commit '01a868d73b2c0a8c969a4ad37af0e0a98a9eb156':
Strings for new Dock settings screen, to get started on the L10N.
This mainly changes the way both enablers react to the airplane mode. Now
enablers show a toast message instead of disabling the check box directly. This
avoids the inconsistent state introduced by WirelessSettings which controls the
check box using layout dependency.
Related bug: 2053751
Merge commit 'd638a7cb0841184349edbec2c995a36e5719cb8c'
* commit 'd638a7cb0841184349edbec2c995a36e5719cb8c':
b/2335545 Revert the dock strings back to "For Music and Media"
Merge commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e' into eclair-plus-aosp
* commit '04e32ff35fe60cdd62509cff1df24d62cd464f4e':
b/2335545 Revert the dock strings back to "For Music and Media"
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 'af03e5f0f32d56b831bdb2c849e32af796e49306'
* commit 'af03e5f0f32d56b831bdb2c849e32af796e49306':
b/2296110 Dialog for setting up dock audio.
Merge commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae' into eclair-mr2-plus-aosp
* commit '41eb38412a0c1337ea4e61dcc4d35f82292ba0ae':
b/2296110 Dialog for setting up dock audio.
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/2296110 Dialog for setting up dock audio.
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 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032'
* commit 'a11c57234f99f987cd4bdc7f2aa6d02a54ce3032':
b/2296110 New Dialog which appears when phone is place on dock.
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-plus-aosp
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
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 'b6d5b264649f7940739fd5b15755e75ccd7633fc'
* commit 'b6d5b264649f7940739fd5b15755e75ccd7633fc':
Feature #2296147 Settings for Car/Desk Dock on certain devices
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
Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
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.
Merge commit '379953def17d6aec7a07a01a7d337403c63bdf44' into eclair-mr2-plus-aosp
* commit '379953def17d6aec7a07a01a7d337403c63bdf44':
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
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
(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
