Merge commit 'b62f48c6d32f74d8683bc300332afd5635af143a'
* commit 'b62f48c6d32f74d8683bc300332afd5635af143a':
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Merge commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7'
* commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
Add Safety information to Settings > About Phone
Merge commit '72233c9d02f27a21d03f8560cc50132168cf6464'
* commit '72233c9d02f27a21d03f8560cc50132168cf6464':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit 'a38a1a77ab36e6779790401c3a02604e428ac58b' into eclair-plus-aosp
* commit 'a38a1a77ab36e6779790401c3a02604e428ac58b':
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
* changes:
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
Merge commit '22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp
* commit '22e186898e47cf35a49e73494bf11695c854d284':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit '44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11'
* commit '44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11':
Restrict Bluetooth adapater name length to 200 characters.
Merge commit '520c7356cf86b681fc670fce49e2749c9fb2bff0'
* commit '520c7356cf86b681fc670fce49e2749c9fb2bff0':
b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Merge commit 'e7f230a36332f5cdc1454e9ce44195c01a49806f'
* commit 'e7f230a36332f5cdc1454e9ce44195c01a49806f':
Search and rewrite some uses of select and disable for touch and use.
Merge commit '51a81002ec11b4aa57eadf40ad10aa09248381a0' into eclair-plus-aosp
* commit '51a81002ec11b4aa57eadf40ad10aa09248381a0':
Restrict Bluetooth adapater name length to 200 characters.
Merge commit '0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e' into eclair-plus-aosp
* commit '0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e':
Set selection in single choice list.
Merge commit '776dcff14387140721d46ccd97cf51ce81be7f85' into eclair-plus-aosp
* commit '776dcff14387140721d46ccd97cf51ce81be7f85':
b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)
Merge commit 'f73cdd4dd09d585cf59c3c91872bc21449491b03' into eclair-plus-aosp
* commit 'f73cdd4dd09d585cf59c3c91872bc21449491b03':
New icon for Privacy.
Merge commit 'ec54997a04307887b709c607808dace00df2f138' into eclair-plus-aosp
* commit 'ec54997a04307887b709c607808dace00df2f138':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Merge commit 'e65c943f974966e21c6f18dc9a95107ea1f07631' into eclair-plus-aosp
* commit 'e65c943f974966e21c6f18dc9a95107ea1f07631':
New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section
Merge commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0' into eclair-plus-aosp
* commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0':
Search and rewrite some uses of select and disable for touch and use.
Merge commit 'dd5dd7d93dbf895d50b651027ef68a75f1f14a51'
* commit 'dd5dd7d93dbf895d50b651027ef68a75f1f14a51':
b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
