- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975'
* commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
Reduce the number of keystore connections to 1
Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'
* commit '38322393a6d029349ef4ef4f80757da175029bcb':
Reduce the number of keystore connections.
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'
* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
Fix the NullPointerException in Status Info.
Fix bug 1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.
modified: src/com/android/settings/deviceinfo/Status.java
Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c'
* commit 'c538b651a23287ab25584995c6c4b7a68ece027c':
Fix some UI flow issues when the keystore is locked in WiFi setting.
Merge commit '79748b42e3e891c0d1541753c133fa83638146ce'
* commit '79748b42e3e891c0d1541753c133fa83638146ce':
Fix duplicate entries being added when application is in active use
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.
We also allow access to the VPN settings under the same circumstances.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '6120ddd7863d1240a535bc111b62e068c8736058'
* commit '6120ddd7863d1240a535bc111b62e068c8736058':
Capitalize the first letter of a VPN name.
+ Now it shows shadowed "(unchanged)" (as in wifi settings) and "(not set)"
instead of two dots.
Patch Set 2:
+ Show cancellation confirmation dialog only when there's change in
profile.
Patch Set 3:
+ Re-enable profile preferences when the reconnect dialog is cancelled.
Merge commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86'
* commit 'b2295174dcb27efa0bf2fb58bb31a517413d9c86':
Add the missing phase2 field in EAP configuration.
* changes:
Reorganize message posting when updating sizes and resources. Rather than posting a message for each package, post a message for a set of packages(8) so that we don't end up posting too many messages and making the UI non-responsive by keeping the Handler too busy. We just pass the loaded info as a map in the message object. Changes to back ground threads that compute sizes and load resources.
