Merge commit 'a55ae92a132325e9307f291c455b1148d0bff3cf'
* commit 'a55ae92a132325e9307f291c455b1148d0bff3cf':
Remove isCustomized() check as the API is not used for now.
Remove LAUNCHER category from VPN settings activity's intent filter.
Improve power control widget GUI.
Minor UI improvements and showing of unplugged duration.
Make the Settings side of the date format settings more locale-aware.
Remove the two formats that have a spelled-out month, since applications
using this setting are trying to format numeric dates.
Do not forcibly set the setting the first time you go into Date & Time --
let the setting remain null if it was null before.
Add a choice corresponding to null to the list of format options. It will
look like "Normal (12-31-2009)" in the list, and will cause the system
to use whatever numeric format the locale calls for.
For the other choices, feed them to the locale-aware formatter so they
will appear with the punctuation that the locale calls for.
Merge commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0'
* commit 'a1ff25c973fc5a65e32eab8b352d619c95fb24d0':
Removing the summary texts for the Accessibility checkbox
Merge commit '150d5d84e8913e93402950a84ff991b7549b71b4'
* commit '150d5d84e8913e93402950a84ff991b7549b71b4':
Use the keystore service instead of the direct file access.
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'
* commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
Revert "Use the keystore service instead of the direct file acess."
Merge commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884'
* commit 'e97bfa3c2581bc59eceaaf043b7059dc29307884':
Fix the bug of missing EAP setting in wpa_supplicant.conf when a new EAP is configured.
Merge commit '289705f3311932a45adef1710358f5e302115013'
* commit '289705f3311932a45adef1710358f5e302115013':
Use the keystore service instead of the direct file acess.
Merge commit '78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6'
* commit '78fd96a1c5dd7b03fa09d8b3116243cc9661c5e6':
More details in the summary and details screens.
Merge commit '8036862226b6cdb6903c2591e66b4b9328b1d484'
* commit '8036862226b6cdb6903c2591e66b4b9328b1d484':
Adding support for selecting the default language for Text-To-Speech in Settings.
Show packages included, time that a subsystem was on for.
Load label and icon in the background and cache the values.
Switch between totals and since-unplugged.
Other UI improvements.
1. Remove the isEnterprise() filter in Scanresult.
2. This requires the new fields such as identity, eap, certificate/key
to support EAP authentication in Wifi Settings.
3. Add simple file-based keystore to select the cert/key from UI.
-- Updated from the comments.
-- Fix the bug for passing null pointer for adding spinner items.
This widget allows uses to turn on/off bluetooth, wifi, gps, and sync,
and adjust brightness without going through the settings menu.
The widget provider updates the settings when the buttons are pressed.
The widget provider is also a receiver for events indicating that the
status was updated elsewhere and the buttons need to be changed.
This is needed so we can correctly update the network location checkbox
if the network location provider is disabled because the user disagreed
to the terms of service in a dialog shown by the provider.
Signed-off-by: Mike Lockwood <lockwood@android.com>
