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.
When in device picker screen, if other device triggers pairing process with own
device, after paired succssfully, it should not send intent to OppReceiver to
start file sending. We need check if the paired device is the one user selected.
Original Author: Lixin Yue
Modified by: Jaikumar Ganesh (jaikumar@google.com)
Change-Id: I32df995ba94417470cccaead492844a9c61c0846
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.
Merge commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01' into eclair-plus-aosp
* commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01':
Filter devices by UUID and then class.
The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.
Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59
Merge commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c' into eclair-plus-aosp
* commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c':
b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.
Merge commit '031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp
* commit '031ba6a3648367d307596f11b94367e50651397b':
SecuritySettings: use Credentials instead of CertTool.
Merge commit '59d1977ccd2ad686c39770aad31cae04a5c8d457' into eclair-plus-aosp
* commit '59d1977ccd2ad686c39770aad31cae04a5c8d457':
WifiSettings: use Credentials instead of CertTool.
Merge commit '30f8a38786c63796ba9914adfdd45b4134adbbb3'
* commit '30f8a38786c63796ba9914adfdd45b4134adbbb3':
Remove long animation setting (standard length is now longer).
Merge commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc' into eclair-plus-aosp
* commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc':
Remove long animation setting (standard length is now longer).
Merge commit '5466090cb8bb8f93423a19902157e6cea8c4fc62'
* commit '5466090cb8bb8f93423a19902157e6cea8c4fc62':
Change default filter to third party when launched via settings and all apps when launched via
