Merge commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'
* commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
Remove link to Contributors. Fix for #2022496
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.
Merge commit '53a1e445443865ef98f16652c7b403eee17499e8'
* commit '53a1e445443865ef98f16652c7b403eee17499e8':
Implement the Back button handler to save a VPN.
Merge commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8'
* commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8':
Disable suggestion for certain types of text boxes.
Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'
* commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
Add a way to override the display names for locales in the locale picker.
Merge commit '241610e986a8d2823f519762737903779089c253'
* commit '241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
Merge commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4'
* commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4':
Removing translated text for compatibility option, which has been moved to SpareParts
