History log of /packages/apps/Settings/src/com/android/settings/SecuritySettings.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
0698a216311acd9ab52224602d1a75c08bf89f04 17-Oct-2014 Jim Miller <jaggies@google.com> Several fixes to new EncryptionInterstitial dialog.

The code now observes whether accessibility is turned on when
deciding the default state.

Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.

Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.

Fixes bug 17881324

Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
250b9bee685de8f4060dd410f0894c22de1909cf 06-Sep-2014 Jim Miller <jaggies@google.com> Fix problem where rotating the device doesn't launch TrustAgent pref

This fixes a bug where the TrustAgent intent was being lost when
the device configurtion changes. It used to depend on a view that
gets recreated. Instead, we persist the actual launch intent
which works across activity restarts.

Fixes bug 17040470

Change-Id: Ia1c93867254cfdc27683a767cf41fe74dbb97db0
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
9d25005e7ab39bcc14722f7bdb977ceccb6107dc 22-Aug-2014 Jim Miller <jaggies@google.com> Show trust agent entries as disabled rather than removing them.

Fixes bug 17108810

Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
300e920f66c03b390ce738ccf4d4646ffa039d40 15-Aug-2014 arete <arete@google.com> Keep SwitchPreference status until user makes choice in confirmation dialog.

Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
17224826f896278de0805e6a2fec321701bbb83d 14-Aug-2014 arete <arete@google.com> Cannot cancel in the "Warn app installation" dialog in security settings.

Bug: 16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b37ad3d0e903a602272c8ce6e5c51630b5ca063b 13-Aug-2014 Jason Monk <jmonk@google.com> Merge "Handle default properly to avoid scary logging." into lmp-dev
b08853aad9f3ef2dc3ba1f1c7a513a16220d4d9e 13-Aug-2014 Jason Monk <jmonk@google.com> Handle default properly to avoid scary logging.

Lock-to-app enabled should default to false and not bother logging
about it not being set yet.

Bug: 16958525
Change-Id: If0d595107d4d40a62ac5d2cc461a8aa18ff80e19
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4a9065e6547c24c751b0aecbc151e57bcbcf92ea 09-Aug-2014 Jim Miller <jaggies@google.com> Update SecuritySettings to use SwitchPreference

Fixes bug 16900059

Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
fe7655914de3852093c35600df996824d03ddf63 01-Aug-2014 Jim Miller <jaggies@google.com> Don't show TrustAgent entries when no security is enabled.

Fixes bug 16383666

Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b8684d573e1357ee573f26d511a630b39e368d0f 22-Jul-2014 rich cannings <richc@google.com> Remove "Verify apps" from Security settings

The setting moved to Google settings

Bug: 15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
27d7ea56f3f02ea7efaf1e57b5d6758ddb56c353 18-Jul-2014 Jason Monk <jmonk@google.com> Add Screen pinning back to settings

Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8fd852e7c2f488650095024aca9c51f8c7ddc3b3 25-Jan-2014 Nicolas Prevot <nprevot@google.com> Add new "pin complex" type to supported keyguard PINs

This adds a feature to allow DevicePolicyAdmins to prevent using
simple PINs, which are defined as those containing more than 3
repeated values. Examples include '1234', '2468', '1111', '9876', etc.

Bug 12081139

Change-Id: I68d8fe2459837cb5e083724e1740e65f0519f7e1
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
1682a0d1be53562a8ca2d0eb8fcd41b07af2f144 25-Jun-2014 Ido Ofir <iofir@google.com> changing language for security screen regarding trust agents
and fixing a bug with multiple trust agents.

Change-Id: I14ee45110a20124d8f9ed2dc80214aff4dc521d3
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5bdf0423f9dbc3cf5970045aacdfef79daacc430 02-Jul-2014 Fabrice Di Meglio <fdimeglio@google.com> Fix SettingsPreferenceFragment.startFragment()

- was always passing R.string.lock_settings_picker_title as a title res

Change-Id: Iab47ef3da00e91d5ce3b6dc50c50c943bd78b08f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d729029b904d43c5c6d06f1d95004fe35445873d 01-Jul-2014 Fabrice Di Meglio <fdimeglio@google.com> Fix some Dashboard top categories not showing for Search

- fix Date & time / Printing / Security

See bug: #12910134 Implement Search into the Settings App

Change-Id: I7e96eb35a6802fde7589ccfe244e71f8be43dea8
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
233ccd0cf798de779628984441f48c239fe86921 23-Jun-2014 Julia Reynolds <juliacr@google.com> Credentials should be shown but can't be modified.

Change-Id: I1a22a0ffb244d6cec3c64b2224fa5e9639bf4673
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
31648b54dcab4f1665a99dbac809400ec8c3c3ee 20-Jun-2014 Ido Ofir <iofir@google.com> Fixing a bug in the security menu.

Change-Id: I583a391773a1cdee429e8fe92f7347883f301825
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
cbfda988167e5a08382dc64cb006f526faaa7c62 13-Jun-2014 Julia Reynolds <juliacr@google.com> Merge "Remove pin and add restrictions for Security settings."
565653cef1039ab4e34e505185f1c77d847357cd 12-Jun-2014 Julia Reynolds <juliacr@google.com> Remove pin and add restrictions for Security settings.

Bug: 14081992
Change-Id: Iec5667202b6f5ae5b5a2a0cfded1a832d98adaf9
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
524a63b493c2c9692dd09669173c96e69e09297c 12-Jun-2014 Ido Ofir <iofir@google.com> Small fix to trust agent item in security settings.

Change-Id: Ie3157e0c9c68bbab5ba394f61c12d1bbf075bb06
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
da113638122dc1d9e8b3b621ca1c7740b3752d1c 04-Jun-2014 Adrian Roos <roosa@google.com> Ensure trust agents are only provided by platform packages

Ensures that Settings only shows TrustAgentServices from
platform packages.

Bug: 15287044
Change-Id: I62c131d99c7266f8617ec32a50a4f5549a07b4b7
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
6f482447b05492906755d91ac4c29ec505a8a544 09-May-2014 Ido Ofir <iofir@google.com> Moving the trust agents settings in the security settings menu and adding
personal unlock.

Change-Id: I0eeb3a32c55450af2435112a98aa44475159dc4f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
ad0c06aca383161a2d617a23c8d8cdb39ba15ead 20-May-2014 Andres Morales <anmorales@google.com> Revert "Settings for NFC Unlock"

This will be rolled into a Trustlet

This reverts commit fd2b6293358bda6f6beaab088e8913a13c0e2e31.

Change-Id: I921f0838d4646799b6664da64a578a209e9c037e
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b05a065a09030a2facfd1c647064cab844e1d467 17-Apr-2014 Adrian Roos <roosa@google.com> Remove the lockscreen widget setting

Bug: 14087729
Change-Id: Ia276411f7622fe1211528ab779a7099bb20800d4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d1d2f0222443ace71e0cd48c7ad1538627f7a286 12-Apr-2014 Fabrice Di Meglio <fdimeglio@google.com> Search - add indexing of SecuritySettings

- implement a SearchIndexProvider for providing the data to index
- some code refactoring to extract some helper methods

Change-Id: Ia8818c17d1bead7306b528d242cdc24c863c17eb
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
347f944a22513d8fb6b41ef185fd8ea872ebcfee 11-Mar-2014 Dan Sandler <dsandler@android.com> Finally, a place for notification settings.

Consolidated under the new Notifications settings are:

- Ringtone (from Sound)
- Zen Mode (from Sound)
- Pulse LED (from Display)
- Heads-Up Notifications (from Display)
- Notification Access (from Security)
- Show when locked (from Security)

Change-Id: I214d03ba1e356e088323a3058d98d390b8a8f988
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
91d014a9658d63c141741414a998f1da89a4dbc6 19-Feb-2014 Dan Sandler <dsandler@android.com> Settings>Security>Show notifications (on the lockscreen).

Allows the user to toggle
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,
which if set shows the complete private contents of that
user's notifications atop a securely locked screen. When
unset, only the "public" versions of notifications are shown
(which may include explicit redactions made by the app).
See f/b change I32bb7939 for details.

This checkbox is hidden for insecure keyguards ("off" and
"none"). It is also unavailable if
Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS is not set
(see f/b change I9c517949.)

Change-Id: Ie1b4c6b949b597b97e536d8ea7e35c9de9b6995f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5786e5f47193b13896b4cda4867d2a45665fb2f6 16-Dec-2013 Andres Morales <anmorales@google.com> fix npe in SecuritySettings

Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
fd2b6293358bda6f6beaab088e8913a13c0e2e31 26-Nov-2013 Andres Morales <anmorales@google.com> Settings for NFC Unlock

Change-Id: Ifaa2717da6c364daa7af073e42fc8f6a097c14bb
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
1630ef4fc5f4131d7d7ef823ba5afba3b5b3fa72 29-Oct-2013 Chris Wren <cwren@android.com> remove lockscreen widget checkbox when there's no lockscreen.

Bug: 11190345
Change-Id: I1b48e7a6a70226b103d8a6a27bd3374ff8349b3f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0366d14fb8b1cfad20a016ecb0ae714a41419d33 29-Sep-2013 Jim Miller <jaggies@google.com> Disable keyguard widgets on low memory devices

Fixes bug 10784493

Change-Id: Idc1c35faf0715814fa1a257319888945c82527c6
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
9506d857cbc87a3dcedc8c3599f1d45ac6fe995e 28-Aug-2013 Maggie Benthall <mbenthall@google.com> Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
ef3e701b78134baf753484c44b7d1915029faa3f 21-Aug-2013 Jim Miller <jaggies@google.com> Add setting to disable keyguard widgets

This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default. If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.

Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f48206e37e8a88a2f5f9b019995488696f8bf964 20-Aug-2013 Maggie Benthall <mbenthall@google.com> Fix NPE in SecuritySettings.onResume()

when DISALLOW_CONFIG_CREDENTIALS is true.

Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
6e1102d9faf1b8f038857709412c291ef6140aa9 07-Aug-2013 Geoffrey Borggaard <geoffreyb@google.com> Restriction pin changes.

Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.

Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
fe21d9aaa8a8c7f8a759805ba021b59dd821e4fe 03-Aug-2013 Geoffrey Borggaard <geoffreyb@google.com> Pin protect more screens.

When these screens are locked down with user restrictions,
it should prompt the user for the restrictions pin before allowing
access to the settings screen.

Change-Id: Iadbb087da2d9470b855ea0bea89f2da1ffb9e854
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
55dbdf68f966d5218a265086f848f60d5a75c13f 15-May-2013 John Spurlock <jspurlock@google.com> Hide notification listeners setting if no listeners.

Hide the new notification listeners management setting when
no listeners using this API are available.

Bug: 8454150
Change-Id: Iae9f975e7b5a3cdf55ff7d0c6aea7e84166d53b3
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b0171715876b672c94c8a5aaafde95ff47b234b4 29-Apr-2013 Amith Yamasani <yamasani@google.com> Three kinds of owner info - owner, user and profile

Bug: 8736733

Put the summary "Restricted profile" under the user name in app restrictions panel.
Bug: 8736734

Change-Id: I6b724bd10a9246eb57831bffb737a48c01e0c285
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
2774bc4413e103e79768ddace8356c997984513e 23-Apr-2013 Amith Yamasani <yamasani@google.com> Merge "Fix repeating apps on pause/resume" into jb-mr2-dev
1bad7141b4c602399beaddde49ac295ae1a89afc 22-Apr-2013 Amith Yamasani <yamasani@google.com> Fix repeating apps on pause/resume

Preference list was getting duplicated on pausing and resuming the activity.

Pull the user info out of the preference list and make it a static header
so that it stays fixed. Can now remove all entries before re-adding.

Disable location by default and disable ability to change Unknown sources
toggle.

Bug: 8685561
Bug: 8688400

Change-Id: I64ce728d5369e03ddaba562bcd66bb0720a037d2
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
c4372c3e3fd2d0be54341973bd72ec618931057c 22-Apr-2013 Kenny Root <kroot@google.com> Fix Clear Credentials item

This should be enabled whenever there is a credential in the keystore
since there can be unencrypted credentials in there now.

Bug: 8651830
Change-Id: I52a8262011d744d782b35d97deaabcba3b23f32b
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
e11a346f1fe6adeb183e7dfb622ac6ab40016794 17-Apr-2013 Amith Yamasani <yamasani@google.com> Remove wifi/bt restrictions choice for limited users

Bug: 8631653

Make "Unknown sources" visible but disabled if restricted for limited user.
Bug: 8629605

Also show the restriction name as the dialog title in the picker.

Change-Id: I8d6ea3571bcc4372347cad6a2c982f35afa7cc09
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
11bd33a564d4ae9a48195ad11dbbd09d80e59b55 11-Apr-2013 Emily Bernier <ember@google.com> User restrictions for creds storage & user removal

Change-Id: I423e729f73ece6209875d2f8d194d0d11c975c20
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
c5550c2012c505dfb27d9a8da8ecb4787f366283 08-Apr-2013 Kenny Root <kroot@google.com> Allow multiuser use of keystore

Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit cc48b0104e4d81592055a578a33f2a59f29bf907)

Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
79b9bfe56ee4036fbe8d9bcac01260356309ae2f 04-Apr-2013 Daniel Sandler <dsandler@android.com> Notification listeners can be enabled in Settings>Security.

Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.

Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
028634b6af87665c5d62b0aee669ce376cef065d 29-Mar-2013 Kenny Root <kroot@google.com> Add KeyStore storage type to Settings UI

Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

(cherry picked from commit 39b56008be0ad0b50fd65ec8fc1c6f9d81d60959)

Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0c5a401a58b30041d5fe712d78fccbd47f5b744d 14-Mar-2013 Maggie Benthall <mbenthall@google.com> Respect user restrictions about adding/removing accounts, sideloading

Hide or disable options in the settings app when the user is restricted from
making changes.

Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.

Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.

Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
ca714d8d0c11c904b25bc20a0a9b2f2cc8d78ad5 14-Feb-2013 Kenny Root <kroot@google.com> KeyStore: stop using state()

Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
783ea85bec4ec3b2f0fa9dd06cf065e527daf04c 02-Nov-2012 Jim Miller <jaggies@google.com> Disable the "none" security selection in settings when there's only 1 user

Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0b2bd8d11d6947a6ce71db0691ba341aec7a2964 30-Oct-2012 Michael Jurka <mikejurka@google.com> New widget picker for keyguard widgets

New layout for widget picker is still not up to
final design, but this change prepares all the
backend work

Also, remove use of features filter from the
picker, since this is being removed from the API

Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8a4024ecac34515947b185c153e1055549713b38 26-Oct-2012 Michael Jurka <mikejurka@google.com> Add ability to add clock widget to keyguard

Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
89a30ffc6343ce9288e9fc253108bfc749d5387f 24-Oct-2012 Michael Jurka <mikejurka@google.com> Adding ability to add multiple keyguard widgets

Bug: 7381803

Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
afc0036e27d4240a354595b1aa08e8f497995e0c 12-Oct-2012 Jim Miller <jaggies@google.com> Merge "Disable security widgets for now" into jb-mr1-dev
e656031ff8c48dffafe965b5859c5c82a5f23fe7 10-Oct-2012 Jeff Sharkey <jsharkey@android.com> Move lockscreen to using haptic feedback setting.

This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
1a6e3e175d8ccb5884d147bcda1c77af1f6c35ff 10-Oct-2012 Michael Jurka <mikejurka@google.com> Disable security widgets for now

Change-Id: Ia4627d697514c4029fb0fb3250d674ed25495f97
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
93c0ee52cc5709ec7353fee5a01e4dd9000e42d1 30-Sep-2012 rich cannings <richc@google.com> Add Help lin to Settings > Security

Bug: 7210077
Change-Id: I1010356e27d85006e7d7dc62d935b67f53ccde12
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4f64951cb89c5da82fdbba3c02bccf0f3500c2a7 28-Sep-2012 rich cannings <richc@google.com> Merge "Developer setting to skip Package Verification" into jb-mr1-dev
f04211443e9cae815ad89f821b6ec83ec2790c0c 26-Sep-2012 rich cannings <richc@google.com> Developer setting to skip Package Verification

Add a developer setting to skip package verification when installing over
USB/ADB/ADT, but still perform package verification on all other installs.

This change also fixes visibility issues. Namely, now all "Verify apps"
related settings will disappear when
Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE is 0.

Bug: 7183252
Change-Id: I04cfc4f521d1ecb73df56b172cf29cbd84f53dad
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
48af3cdbd934b79ebbcd4639bb63621e93ca9ec2 28-Sep-2012 Amith Yamasani <yamasani@google.com> Merge "Rename "Owner info" to "User info" for secondary users" into jb-mr1-dev
8666b9e170c23a9595d611a49b7c8262e357ced1 27-Sep-2012 Amith Yamasani <yamasani@google.com> Rename "Owner info" to "User info" for secondary users

Bug: 7237781
Change-Id: I40207d6aa34bf3b7403f077fc7f3a945d739269d
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
eeb464ae43180624b7a45c50f643802dda56f2b0 27-Sep-2012 Adam Cohen <adamcohen@google.com> Addressing issue 7243210, can't set status widget properly

Change-Id: I863136bbef123f1c13d9e887840ca48ac7ccbf95
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7fb4f850eabc017bab6090bf9268cf3fae1e08eb 26-Sep-2012 Amith Yamasani <yamasani@google.com> Show more security settings, and fix missing summary in widget selection.

Bug: 7232809
Change-Id: Ib7a67b83f455592ba5e0e48420924671f8ed95e8
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
16398c9c973ba16a14455c4eee9ca162e0273792 25-Sep-2012 Michael Jurka <mikejurka@google.com> UI refinements to security screen widgets interface

Bug #7158868

Change-Id: Ia5be3986323119ea78b9e486b4d2e6e81bf145e7
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
85d4b5f78e831fdfe6da39f6edafd32c7d63dfea 24-Sep-2012 Adam Cohen <adamcohen@google.com> Ensuring that keyguard widgets are bound with correct options

-> We need to bind the widget and indicate that it is a keyguard widget

Change-Id: I8e76b45b86aecc671669022c6f5fad071b62837d
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
091477b4dec614b9b0153ebe1444d2ae81ee1ab6 21-Sep-2012 Michael Jurka <mikejurka@google.com> Add support for changing status widget on security screen

Change-Id: I68a8ce2ce03888a8decbe017d67634c6965f0a1a
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
74dffa1bd5ebc070b8e75cbf27b2b8472b10ff5e 19-Sep-2012 Michael Jurka <mikejurka@google.com> Fix bug: allow users to select "none" for lockscreen widget

Change-Id: Ibd0449899ce7c340a6f838c56de58b70538400fc
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
1dd0024327159deff0401978683b49a7d3879021 18-Sep-2012 Adam Cohen <adamcohen@google.com> Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
3028051ba8e694da7a3e527092d7d99f964aabe9 18-Sep-2012 Michael Jurka <mikejurka@google.com> Fix cases where app widget ids were not being cleaned up

Change-Id: Ie3f1ba0cc0fe459ae9fff2665c2ff4aa76e95994
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
bbc3045a265238fd80547dd9bb61f6801a038886 16-Sep-2012 rich cannings <richc@google.com> Ability to hide verification settings

Add a setting that controls the visibility of the package verification
setting in the Settings app.

Bug:7022814
Change-Id: I6e503924adc112b4528d94b1e533baae6079e85e
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
ce72ec79218e312e30ee0cb3045848c4e6d6ae5a 14-Sep-2012 Michael Jurka <mikejurka@google.com> Fix crash in Settings > Security

Change-Id: Ib439c652f4f8a55cac710dbd22792943a7ef8f98
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8227e303850d7c1162c62947b70d0592432b455e 07-Sep-2012 Michael Jurka <mikejurka@google.com> Add support for setting lock widgets

Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
bfbdceffe60e20a8db91b54cc81cfe49ea0dd96a 09-Sep-2012 rich cannings <richc@google.com> Grey out App Check setting when no verifiers exist

Bug: 7082362
Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d5d60655a9c23ba02b5fc1264fb1680f599b3b07 07-Sep-2012 rich cannings <richc@google.com> Add package verification to settings app

Adds a dialog/toggle in security settings to turn package verification on and
off.

Bug: 7082362
Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5a64c739bfbf644dabd11d5330f577e94d478326 07-Sep-2012 Christopher Tate <ctate@google.com> Update Settings app to manipulate now-global settings properly

Change-Id: I6c269051c7d2db87f70f44df74e06456588c3b6f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
bb06a427eb471227cf42a8078a54ca0581309493 16-Aug-2012 Dianne Hackborn <hackbod@google.com> Rename UserId to UserHandle.

Change-Id: I04b86f3777c28fb83f03eb404dd5c2eb18d3da8f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
cfe8c4b0cd0325e4cb7a33c2a5a2936d932108a8 14-Jun-2012 Danielle Millett <dmillett@google.com> Fix 6654057: Fixing crash if device is rotated during confirm password

In onActivityResult, mBiometricWeakLiveliness can be null if the device was rotated
during confirm password. To fix this, the line accessing mBiometricWeakLiveliness can
safely be removed. It's unnecessary because when onActivityResult finishes, onResume is
always called when it displays the security settings again. Since onResume sets the
checkmark value based on the stored value in lockPatternUtils, the check mark will always
show the correct value when settings is displayed.

Change-Id: Idba9ae1d829911a9581bb6678c4d1f3b44784c63
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4a3e40d68e8b01871121655456d7a1dfa3312f71 06-Jun-2012 Danielle Millett <dmillett@google.com> Removing head turn and putting blink back

Changing the strings and workflow in settings to be blink again
instead of the new head turn. This basically undoes the following
two cls: I67c8acd4 and Ifc7b6e18.

Change-Id: I8694b1d82efac9d2f97c29128da6698b6ac2a4ce
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5c489be89cad070cefc04e9b59f84a0b9d1a26ec 31-May-2012 Uriel Rodriguez <urodriguez@google.com> BUG 5457035 : Anti-spoofing : DO NOT MERGE

Squashed commit of the following:

commit 060b9daf5fe3c45573a13a149bf98f4fa1e6a46f
Author: Danielle Millett <dmillett@google.com>
Date: Wed May 30 15:50:03 2012 -0400

Added head turn option for Face Unlock.

In security settings there is an option for head turn and it shows the current
status (on/off). Clicking on this goes to another screen that describes the
feature and allows the user to it on/off.
Since the head turn option goes to a different screen instead of using a check box,
this change also rips out the rest of the code for the old liveliness checkbox.

Change-Id: I197af51084f3e751081fa159dadd6c2c80840d1e

Change-Id: I67c8acd49316b49771a0bb97b4a5fbd5a1c13262
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5c68e12493d3c81324179c7c3ba6cd58279d648b 24-May-2012 Amith Yamasani <yamasani@google.com> Don't show SIM LOCK settings if there's no Icc card.

Bug: 6525359

Change-Id: I7bf2a1799ca3032a5dbfa15320d862195b9659f7
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b810a0ddf9dd93a08789aff38901eeab9bfaf812 25-Mar-2012 Amith Yamasani <yamasani@google.com> User management screens

Customized Settings for restricted users
- Only some top-level settings panels available

User management
- Primary user can add and remove users
- User details screen to change name and list of enabled apps

Change-Id: Ia6beb991b427197a4ec2724ca3c9222073f6cf7d
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
790e0c3ef3f11d7472ad676ce8314a73df190190 23-Mar-2012 Danielle Millett <dmillett@google.com> Fix 6101396: Added password check when turning biometric weak liveliness off

Forcing the user to confirm their password when they turn liveliness off to
prevent a someone else besides the owner from turning it off.

Also renamed CONFIRM_EXISTING_FOR_BIOMETRIC_IMPROVE_REQUEST to
CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST.

Change-Id: I4244c9a16340839b7cb7b4a1f9ca395db0c30eee
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
a87a25bdec7b991bfa6ef3ea9dfacd0ed162044e 19-Mar-2012 Danielle Millett <dmillett@google.com> Added a liveliness check box preference for Face Unlock.

This will be used to enable or disable liveliness detection.

Change-Id: I0be735724aed4cadbd5c37d895a7f80ad4f4ee09
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
071742d838f9b0c312af309c87eaf2c444aeeab8 07-Jan-2012 Jim Miller <jaggies@google.com> Fix 4560303: Add setting to lock later when power button pressed

This adds a feature to delay locking the device when the power button
is pressed. This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78 16-Dec-2011 Kazuhiro Ondo <kazuhiro.ondo@motorola.com> Don't enable SIM PIN Lock menu if SIM is not available

Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
487b16f3400b62b79f8108ca669cc3e937c69def 02-Nov-2011 Danielle Millett <dmillett@google.com> Adding an improve face matching settings option for Face Unlock

Adding an option which will launch a version of setup where faces
can be added to the current gallery. It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8123493ef905a210bd00b0c623459f4c86505298 19-Oct-2011 Danielle Millett <dmillett@google.com> Fix 5428748: Added more options for biometric weak

Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.

Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0fb158a685d753682afdcffb0b783be8e38e0f2b 30-Sep-2011 Danielle Millett <dmillett@google.com> Reorganized the biometric weak check functions

Moved isBiometricSensorAvailable functionality into
isBiometricWeakInstalled (formerly called isBiometricEnabled). Settings
now only shows biometric weak if it's installed, if it's not installed
and the lock type is currently set to biometric weak, the backup lock
is shown as being set instead.

Change-Id: Icfe326a6598df33ee60d5fdc024273d94f115983
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
31dac17c4b0b49b4968b42b2af6f0799a0508a2f 30-Sep-2011 Steven Ross <stross@google.com> Delete the temp gallery on return from fallback

Change-Id: Id501302aa8c5606006f3e403e51bb01981bc173e
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
c620ba41ce20e683aad3d124b3866cadaddcc87d 28-Sep-2011 Steven Ross <stross@google.com> calling back SetupFaceLock to clean up temporary gallery

This is done when the backup lock is complete or canceled.
If successful, the permanent gallery is replaced with the new one.
The temporary gallery is always deleted

Also deletes the main gallery if the lock type is changed from facial recognition

Change-Id: Id7b066fd852c7ba188d6e46b47391a362cbab40f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5541a86efe5f26956e54de49c4a59bf1dab79a78 03-Sep-2011 Jim Miller <jaggies@google.com> Fix 5185505: Add weak biometric sensors to security choices.

This adds a simple biometric sensor (face lock) to the security choices.

Updated to disable biometric sensor by default.

Change-Id: I088e5e99cf5f8c7a06a1a992a9257940eb2cc07f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
cd05e8859599658a546b5d4ee09068dd2833b901 19-Aug-2011 Wink Saville <wink@google.com> Allow SIM PIN on CDMA LTE devices

Bug: 5161360
Change-Id: I6f98da08e6be08403d9b3b08b02b02b9a63b14fe
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
58bca8f15fbdc9e621b3c259a50ecf41c00e64c3 22-Jul-2011 Amith Yamasani <yamasani@google.com> Fix lock screen timeout summary text on first use.

The lock screen timeout summary is inconsistent with the popup list
when Security settings is launched for the first time. This fixes
the inconsistency.

Bug: 5064223
Change-Id: I8cbd7c06233faddd91ab29a1e046112a6f910935
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
2c88a877f88b142fa8fd36c1773ab484b5fd7338 21-Jun-2011 Gilles Debunne <debunne@google.com> Refactoring in Settings/Applications

Battery, Development moved to main menu.
Unknown sources moved to Security.
Main menu links directly to ManageApplications.
ApplicationSettings was kept in case an other app referenced it.

Change-Id: I0271d4222cfc192f9235f21e06bf3b56f77db1a4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
a6a8a1479b970d8a84395453703348fe42d17438 09-Jun-2011 Gilles Debunne <debunne@google.com> Split Location and Security settings.

Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d4023b7cca11e33e84df39dee9e9a737efab47c2 25-May-2011 Brian Carlstrom <bdc@google.com> Integrating keystore with keyguard (Part 4 of 4)

Summary:

frameworks/base
keystore rewrite
keyguard integration with keystore on keyguard entry or keyguard change
KeyStore API simplification

packages/apps/Settings
Removed com.android.credentials.SET_PASSWORD intent support
Added keyguard requirement for keystore use

packages/apps/CertInstaller
Tracking KeyStore API changes
Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
Tracking KeyStore API changes

Details:

frameworks/base

Move keystore from C to C++ while rewriting password
implementation. Removed global variables. Added many comments.

cmds/keystore/Android.mk
cmds/keystore/keystore.h
cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

Changed saveLockPattern and saveLockPassword to notify the keystore
on changes so that the keystore master key can be reencrypted when
the keyguard changes.

core/java/com/android/internal/widget/LockPatternUtils.java

Changed unlock screens to pass values for keystore unlock or initialization

policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

KeyStore API changes
- renamed test() to state(), which now return a State enum
- made APIs with byte[] key arguments private
- added new KeyStore.isEmpty used to determine if a keyguard is required

keystore/java/android/security/KeyStore.java

In addition to tracking KeyStore API changes, added new testIsEmpty
and improved some existing tests to validate expect values.

keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

Removing com.android.credentials.SET_PASSWORD intent with the
removal of the ability to set an explicit keystore password now
that the keyguard value is used. Changed to ensure keyguard is
enabled for keystore install or unlock. Cleaned up interwoven
dialog handing into discrete dialog helper classes.

AndroidManifest.xml
src/com/android/settings/CredentialStorage.java

Remove layout for entering new password

res/layout/credentials_dialog.xml

Remove enable credentials checkbox

res/xml/security_settings_misc.xml
src/com/android/settings/SecuritySettings.java

Added ability to specify minimum quality key to ChooseLockGeneric
Activity. Used by CredentialStorage, but could also be used by
CryptKeeperSettings. Changed ChooseLockGeneric to understand
minimum quality for keystore in addition to DPM and device
encryption.

src/com/android/settings/ChooseLockGeneric.java

Changed to use getActivePasswordQuality from
getKeyguardStoredPasswordQuality based on experience in
CredentialStorage. Removed bogus class javadoc.

src/com/android/settings/CryptKeeperSettings.java

Tracking KeyStore API changes

src/com/android/settings/vpn/VpnSettings.java
src/com/android/settings/wifi/WifiSettings.java

Removing now unused string resources

res/values-af/strings.xml
res/values-am/strings.xml
res/values-ar/strings.xml
res/values-bg/strings.xml
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-da/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-en-rGB/strings.xml
res/values-es-rUS/strings.xml
res/values-es/strings.xml
res/values-fa/strings.xml
res/values-fi/strings.xml
res/values-fr/strings.xml
res/values-hr/strings.xml
res/values-hu/strings.xml
res/values-in/strings.xml
res/values-it/strings.xml
res/values-iw/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-lt/strings.xml
res/values-lv/strings.xml
res/values-ms/strings.xml
res/values-nb/strings.xml
res/values-nl/strings.xml
res/values-pl/strings.xml
res/values-pt-rPT/strings.xml
res/values-pt/strings.xml
res/values-rm/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-sk/strings.xml
res/values-sl/strings.xml
res/values-sr/strings.xml
res/values-sv/strings.xml
res/values-sw/strings.xml
res/values-th/strings.xml
res/values-tl/strings.xml
res/values-tr/strings.xml
res/values-uk/strings.xml
res/values-vi/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values-zu/strings.xml
res/values/strings.xml

packages/apps/CertInstaller

Tracking KeyStore API changes
src/com/android/certinstaller/CertInstaller.java

Fix for NPE in CertInstaller when certificate lacks basic constraints
src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

Tracking KeyStore API changes
src/com/android/keychain/KeyChainActivity.java
src/com/android/keychain/KeyChainService.java
support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0f85c48d6c77e811f4d949503f0aa3efd908834d 24-Feb-2011 Amith Yamasani <yamasani@google.com> Remove / re-word some settings for WiFi-only devices.

Bug: 3468248

1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"

Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
327147eb062a25ecab40d66ea14559070e0ecef3 02-Feb-2011 Wink Saville <wink@google.com> Have SecuritySettings and SoundSettings use getCurrentPhoneType

To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f8217304073b5cd13823a0602568394be93bf310 26-Jan-2011 Jason parks <jparks@google.com> More work on the Crypt Keeper.

* Use the DPM to determine if we are encrypted.
* Fix misspelling (Comfirm -> Confirm).
* Animate to black when enabling encryption.
* Add holo droid background.
* Change the progress bar to indterminate.
* Display the percentage complete in the status line.
* Fixed bug 3388097. You will no longer have to unplug your device to start encryption. This line is intentionally long. I could make it shorter but I am proving a point: <magic>overflow: auto;</magic>.
* Actually hold onto the wakelock to prvent the device from sleeping.
* Implement onStop() as a orientation change can happen at boot. This will start the activity twice and there will be multiple handlers with messages.

Change-Id: Ia752d106c39e0d81431e856f8f500182e8ec1abd
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4112199ed654f8bd1cea2c9a29a24be3c148b2ed 25-Jan-2011 Jason parks <jparks@google.com> Display the correct encryption settings.

* You can no longer try to encrypt the device when it is encrypted.
* Moved the encryption section below the lock screen section. It will be more common to change the lock screen settings.
* If the device doesn't support encryption don't display the encryption section.

Bug: 3384074
Change-Id: I172f5894a3cea57b1b8d03a84f1ecf0ee500c1f3
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
666800a237066457c5703fc7c746a5d477249d59 21-Jan-2011 Jason parks <jparks@google.com> Remove unused code.

Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
a13e9c877ce4928df0095f47b6117cc4b5403fb2 21-Jan-2011 Jason parks <jparks@google.com> Merge "Encrypt inplace settings." into honeycomb
91d65a20af2d1bfb06f32d0bd821e8558afe939d 20-Jan-2011 Chia-chi Yeh <chiachi@android.com> Extract credential storage dialogs to a new activity.

Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.

Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
3e8b76319d34e2e96819ec9e62d4f19ee7d4e2b4 17-Jan-2011 Jason parks <jparks@google.com> Encrypt inplace settings.

Change-Id: I5b9cb94c987dedecf3bf31cb67a42e2f24866d3b
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7ade84bb9b3e04cc2c19c9a65c1e1706dc6add14 18-Jan-2011 Chia-chi Yeh <chiachi@android.com> Remove obsolete code from SecuritySettings.

Change-Id: Ie1d7167ec8e748b86144e12bed72a3ca0dc99da1
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
6f8fb436178d12d11d6ab59671168f0603bdbdcb 07-Jan-2011 Jason parks <jparks@google.com> Add a setting to enable encryption.

This isn't final and it will wipe your device.

Change-Id: I7fecded92a745844435878d0409d620bfa571472
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
c9787070bab332b80676b745a44dd8ee4d72073d 10-Jan-2011 Jim Miller <jaggies@google.com> Fix 3333490,3250193: Update LockScreen settings

This updates LockScreen to conform to the latest UI design.

Change-Id: Ie88a26db7912ddb4331804e347189cc084c481f4
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
17e9e1933055b207473b488595b2887bfcaea32e 08-Dec-2010 Jim Miller <jaggies@google.com> Fix 3148496: Initial pass at fragmentizing lockscreen settings.

This converts most of the existing activities to fragments and wraps
them in PreferenceActivities so they can be launched as before
(e.g. by a DevicePolicyManager)

Upload after sync/rebase.

Change-Id: I4f351b75d9fca0498bcb04b4e11ff3b70765a4ba
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
36972bb7e952ca8a7bd8e57e32246d60873d7479 01-Dec-2010 Jim Miller <jaggies@google.com> Fix 3201870: Move OwnerInfo settings to Location&Security.

This moves OwnerInfo into Location&Security and adds the
necessary logic to only show it in modes that make sense-
Lock (when not disabled) and Unlock (pattern, pin, password).

Change-Id: I3549dc4d956406aea3d63cd06d37bcea27a5b555
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
edac9af662f01026fd2b4acf263e1b5d1dfdeaa9 17-Nov-2010 Amith Yamasani <yamasani@google.com> Conditional remove "haptic" settings if there's no vibrator

Bug: 3193801
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f8b25796f0ce1096a95cae2b51d07d96e148277c 21-Oct-2010 Mathew Inwood <mathewi@google.com> Add 'Use My Location for Google services'.

This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.

Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug: 3093036

Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
02cf71a5916d1b0155e8fff3f62987cdc5c2b7c3 22-Sep-2010 Amith Yamasani <yamasani@google.com> Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now.

Also fix: 2997438 and a similar bug in Tether Settings
Show + menu item for User Dictionary
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
86624a21540e2cd336573a55adb5d3997e4a717d 31-Aug-2010 Jim Miller <jaggies@google.com> Fix 2579224: Add a separate timeout for lockscreen vs display

This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I033a3578d876148bd723dee5d1a2531be5d6b51d
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d79934731c8d33f6fc63b21c120b9ffba5d06f54 18-Aug-2010 Amith Yamasani <yamasani@google.com> Refactor settings top level activities to use fragments.

Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5e47f95316f164dca8b57584e3bdee97620378ab 27-Jul-2010 Mike Dodd <mdodd@google.com> Fix build.

Change-Id: I9982c3b1a7f844af82513012a267f2efb14a5031
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
58d70800fd791a69b1d89a1e5db496fc4c00d7c6 26-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 885ac770: am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"

Merge commit '885ac7701fc809276aed1be151b9ecd8bd0a1cd3'

* commit '885ac7701fc809276aed1be151b9ecd8bd0a1cd3':
Remove unused imports in SecuritySettings.java
885ac7701fc809276aed1be151b9ecd8bd0a1cd3 26-Jul-2010 Jean-Baptiste Queru <jbq@google.com> am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"

Merge commit '46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp

* commit '46c0a5b12973fcd40b72b48fe344e45f1110865e':
Remove unused imports in SecuritySettings.java
844d2a34a20e4e94927854f76c8963d95f2ad9f6 25-Jul-2010 Ben Clark <benbread@gmail.com> Remove unused imports in SecuritySettings.java

Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
57fbf694a53afb9c1924d81272179dceb3acfa4d 28-May-2010 Konstantin Lopyrev <klopyrev@google.com> Change I546ee2fb: Fix 2677197: Adding minimum complex character support.

Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
e587fb670af90cb4cfc50bbaa11f20574657ef29 12-Apr-2010 Jim Miller <jaggies@google.com> am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo

Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken

* commit '0b326a6fad8caf250b61cc49b962495202562a5c':
Fix 2579923: Make changing lock screen method more discoverable.
bbb4afa19f75694c585506b0c091372d60e07ca7 09-Apr-2010 Jim Miller <jaggies@google.com> Fix 2579923: Make changing lock screen method more discoverable.

This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.

Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.

In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.

Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.

Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
6f72be68c1cc2277e590c5f249b2556c45b1d1c5 27-Mar-2010 Oscar Montemayor <oam@google.com> DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
af366a3ed66dcb3c3ecb1dd101e5d8869b518598 26-Mar-2010 Jim Miller <jaggies@google.com> Fix 2535700: Add support for enforcing password quality

Change-Id: I908b4229d46061f3d450adec72b04276fe10afc1
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4037c7f27c849a1ada0980ad881636fc940a0b85 27-Feb-2010 Dianne Hackborn <hackbod@google.com> Move DeviceAdmin APIs to android.app.admin.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
c5a73328f16c9000f2256207cb675e2fb5f0fc88 26-Feb-2010 Oscar Montemayor <oam@google.com> Temporarily hiding enabling non-working functionality UI option for Froyo early droidfooders.
Tracking issue in bug 2475355 Review Settings app options for non-working functionality.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
9e61b9fe59aca9ac521792f4f89e5a270333b030 19-Feb-2010 Jim Miller <jaggies@google.com> Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
122b6c85a9bc7076eacc388142f8c4fccc5462c9 11-Feb-2010 Jim Miller <jaggies@google.com> Fix 2332563: Update logic for lockscreen in Settings.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
3352d10f0733eb8b8715ce89346378444fbfe3b2 11-Feb-2010 Dan Egnor <egnor@google.com> Perform master clear via Intent broadcast, rather than using ICheckinService.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
30e4d965121ae7f049f090862a5c246515a0bf34 08-Feb-2010 Bjorn Bringert <bringert@android.com> Remove USE_LOCATION_FOR_SERVICES from Settings

This has been moved to GoogleSettingsProvider
as part of unbundling.

Part of http://b/issue?id=2383870

Change-Id: Ia8e5725b1749fa95436fade0ea23061eb2ca4822
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
33111717d52132fca41661e87f8fb51c4b23492c 29-Jan-2010 Dianne Hackborn <hackbod@google.com> Update to follow password mode->quality API change.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8cecf89cec3ea14003482c046eec7d2aba8bb0ad 28-Jan-2010 Dianne Hackborn <hackbod@google.com> Update to follow device policy changes.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
abc3dc64cf61c9f5c28b6f2640b221d63cb86a0a 20-Jan-2010 Dianne Hackborn <hackbod@google.com> Start hooking up password device policies

This introduces a new activity for changing the password, which takes
care of launching the correct password activity based on the caller's
request and active policy. The security settings activity now uses
this, and it implements the API action for launching the password UI.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
47d380f1e6c823cea444004cb799d4c791145cc6 20-Jan-2010 Jim Miller <jaggies@google.com> Fix 2385283: Add DevicePolicyManager calls to LockScreen.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
feff65213231ba6a0f6185f98e660042b5b14595 13-Jan-2010 Dianne Hackborn <hackbod@google.com> Initial UI for managing device policies.

More to come... what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
00d2476d8fc122b4eef59d6be6f7aa41e9c56fde 23-Dec-2009 Jim Miller <jaggies@google.com> Fix 2332563: Add password-lock support to lockscreen
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
56e1526114639dd7f19ef0aa90defd10756bf22d 30-Nov-2009 Oscar Montemayor <oam@google.com> Encrypted File Systems. Recovery process - adding interface settings to toggle feature.
Created a confirmation dialog before rebooring the device.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
8877f74901b456d45aaf7a47f6d2208fab9e283c 12-Nov-2009 Oscar Montemayor <oam@google.com> Encrypted File Systems Project. Enabling Settings menu changes to transition to EFS mode.
Menu interface changes only. Does not affect operatio forthe rest of the system.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
0bc5e275fdbbb8e80f8259136caf45a356922c40 06-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: reduce 1 access to KeyStore and clean up.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
454a0dbf8ff6d638e4ad31e30007bf3099a509cc 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: revert "minor tuning".
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f764d20a74c0ac1f665447a09e94082ba248f283 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: fix a the status before handling the intent.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
844d3db3fec2e84ae5b06ccc8511c37f2a07f192 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: set the check box before further processing.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
446bf8b5bc845d14df2f7e1a860d3e28d4542bb6 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: minor tuning.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
bf07c83d927efe567a4fc59e615c3a8977d0766f 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: remove debug messages.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
a7c57145993a190a38519f53eab14c98a48ccbf0 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: remove trailing spaces.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
02f58e898d4ebecb0ec0bc9e8f4dc2732a82962e 01-Oct-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: clean up.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
b0883cb384fc7ad46e011a72355c9fda924e5b28 30-Sep-2009 Hung-ying Tyan <tyanh@google.com> Fix bugs in credential storage settings:

* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
70cef693d133bc66db029bf055c51733ac54c972 28-Sep-2009 Hung-ying Tyan <tyanh@google.com> Add CredentialInstaller.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
e65c943f974966e21c6f18dc9a95107ea1f07631 22-Sep-2009 Amith Yamasani <yamasani@google.com> 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
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
9cec698a1fbbe5e8d23a96347d4e75003f4b8cb6 22-Sep-2009 Chia-chi Yeh <chiachi@android.com> SecuritySettings: use Credentials instead of CertTool.

Also remove unused classes which will be replaced by CertInstaller.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
10d3cf5082edb42f196ce0d5ac77c7a12b959599 15-Sep-2009 Hung-ying Tyan <tyanh@google.com> Enable cert install from sdcard in Settings...

And remove ADD_CREDENTIAL intent from AndroidManifest.xml.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f71c8b40b5a92e21d09dd75880e16aa857c1b6cb 09-Sep-2009 Hung-ying Tyan <tyanh@google.com> Add install-cert-from-sdcard in Security settings

Also:
* Resume keystore states in SecuritySettings.onResume().
* Use action strings defined in CertTool and Keystore.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f411c9625c70bf9716805f0f1b146f07f4eca678 01-Sep-2009 Amith Yamasani <yamasani@google.com> Show the Use location prompt only once if user agrees. Bug #1910370
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7f894124f4e1b8e7a02f6868adf1c21a25179c66 25-Aug-2009 Mike Lockwood <lockwood@android.com> Hide the "Enable Assisted GPS" checkbox in security & location settings.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f8db1041f5cd7075adc903854d2da981037ef7d8 03-Aug-2009 Hung-ying Tyan <tyanh@google.com> am 233991a2: Reduce the number of keystore connections to 1

Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975'

* commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
Reduce the number of keystore connections to 1
233991a2420bd870a0f85e8e0c4c1c00eaf4b975 02-Aug-2009 Hung-ying Tyan <tyanh@google.com> Reduce the number of keystore connections to 1

at entering the security settings.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
12fb9066a34a99ed987494e60464158d6702d595 01-Aug-2009 Android (Google) Code Review <android-gerrit@google.com> am 38322393: Merge change 9437 into donut

Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'

* commit '38322393a6d029349ef4ef4f80757da175029bcb':
Reduce the number of keystore connections.
79f9fa073cf3311b552a0a055a44a26c06e395d3 01-Aug-2009 Hung-ying Tyan <tyanh@google.com> Reduce the number of keystore connections.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7402052ab8556699de1365da30cb64b36c5b685c 23-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 86637edf: Merge change 8183 into donut

Merge commit '86637edfa2df69016afcabbfc581c00a16041745'

* commit '86637edfa2df69016afcabbfc581c00a16041745':
Improve UX of adding credential...
d8858c3ee12bfdde1bde60dfe7cdf8bc497cf254 22-Jul-2009 Hung-ying Tyan <tyanh@google.com> Improve UX of adding credential...

with more toast messages and fix dialog handling when needs another
dialog to initialize or enable the credential storage.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
41b5321e8b8e795941156ff2c8127d34e2dfe1e7 21-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 241610e9: Add password error hint when adding new cert.

Merge commit '241610e986a8d2823f519762737903779089c253'

* commit '241610e986a8d2823f519762737903779089c253':
Add password error hint when adding new cert.
241610e986a8d2823f519762737903779089c253 21-Jul-2009 Hung-ying Tyan <tyanh@google.com> Add password error hint when adding new cert.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
2fab4ab09c937713d92933ed6d42962c6e01b497 18-Jul-2009 Android (Google) Code Review <android-gerrit@google.com> am 6b1b36a8: Merge change 7687 into donut

Merge commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6'

* commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6':
Add UI to handle PKCS12 cert.
38a44f2445b5c900dd4098837459d1e57bd55907 17-Jul-2009 Hung-ying Tyan <tyanh@google.com> Add UI to handle PKCS12 cert.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
aae9398a315e9bb50c3407ea0b4d2eb270bd69b9 16-Jul-2009 Hung-ying Tyan <tyanh@google.com> am c3eaaad1: Fix "use secure credential" checkbox in Settings.

Merge commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1'

* commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1':
Fix "use secure credential" checkbox in Settings.
c3eaaad17ebe9a2cbe34b096511c8f06369dadd1 16-Jul-2009 Hung-ying Tyan <tyanh@google.com> Fix "use secure credential" checkbox in Settings.

Uncheck the checkbox if the user cancels the password-entering dialog.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5541e9840649785bbc188f20a727fe7307eb74af 14-Jul-2009 Amith Yamasani <yamasani@google.com> am 5c30845c: Fix #1930767 : "Share with Google" not working on orientation change.

Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513'

* commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513':
Fix #1930767 : "Share with Google" not working on orientation change.
5c30845cf310a5d8c2de3e9ac809c97f736a9513 14-Jul-2009 Amith Yamasani <yamasani@google.com> Fix #1930767 : "Share with Google" not working on orientation change.

Discard the dialog after onSaveInstanceState. And check the different
onCreate scenarios before popping up the dialog.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
15384ee22af523017241de9fa0fd5afbdc804ea3 13-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 1ddccd07: Fix dialog handling.

Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc'

* commit '1ddccd07f744344b5248dd5418ee526f26d520dc':
Fix dialog handling.
1ddccd07f744344b5248dd5418ee526f26d520dc 11-Jul-2009 Hung-ying Tyan <tyanh@google.com> Fix dialog handling.

* Changes
+ VpnSettings:
+ Add reconnect dialog to showDialog() framework for handling screen
rotation.
+ Dismiss other alert dialogs in onDestroy()
+ Remove onPrepareDialog() from VpnSettings.
+ Remove updateConnectDialog() from VpnProfileActor.
+ Add authentication error dialog.
+ Add unknown server dialog.
+ SecuritySettings:
+ Make cstor dialogs cancelable.
+ Add cancelable listener.
Patch Set 6:
+ VpnSettings:
+ Disable preferences when connecting/disconnecting.
+ Fix state broadcast when binding a VpnService goes wrong.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
971b79e30667ce24b3e53db021edeb19df4748a9 09-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 66959341: Fix behavior of cancelling the name cred. dialog.

Merge commit '66959341a6b0891893d4c851be708c3073f61154'

* commit '66959341a6b0891893d4c851be708c3073f61154':
Fix behavior of cancelling the name cred. dialog.
66959341a6b0891893d4c851be708c3073f61154 09-Jul-2009 Hung-ying Tyan <tyanh@google.com> Fix behavior of cancelling the name cred. dialog.

The code used to trying to store the credential even when the user
cancels the dialog. Fixed in this CL.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7888cc450a137c68c0f79166367b51f57df0dbe0 06-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 0a59b500: Integrate VPN with new keystore and misc fixes.

Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'

* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
Integrate VPN with new keystore and misc fixes.
acedb4b501ebc1c1d06753b2915ed04e1ed43f24 06-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 4e45d392: Add certificate to keystore for the ADD intent

Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'

* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
Add certificate to keystore for the ADD intent
902a297d92a9bcfc4411b310496bb2bdb3bcf134 06-Jul-2009 Hung-ying Tyan <tyanh@google.com> am 7031ab0d: Add credential storage settings.

Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1'

* commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1':
Add credential storage settings.
0a59b500147cc038541f6f2897de7e28c15a12c1 06-Jul-2009 Hung-ying Tyan <tyanh@google.com> Integrate VPN with new keystore and misc fixes.

* Changes
+ Pass intent to keystore when needed and hooks to resume from it.
+ Generate random, unique ID for profile instead of base64 from its
name.
+ Add VPN to "Wirless controls" description.
+ Add credential storage to "Security & location" description.
+ More hints to set password and unlock dialogs in credential storage
settings for actions that come from other processes.
+ Sort VPN profiles according to the names.
+ Replace Keystore with CertTool in L2tpIpsecEditor
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4e45d392ada4e84fbeed06874caebfd3c7759073 04-Jul-2009 Hung-ying Tyan <tyanh@google.com> Add certificate to keystore for the ADD intent
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
7031ab0d756327496ac3ce1e082b53c94be2f3b1 01-Jul-2009 Hung-ying Tyan <tyanh@google.com> Add credential storage settings.

* Changes
+ Initial implementation of credential storage settings.
+ Use alert icon on delete and reconnect dialogs in VpnSettings.
(piggy-backed)
Patch Set 12:
+ Add password length and no-space verification.
+ Simplify dialog view xml files.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
776be77313316ceb25e4d8d8312c1446a98d2de3 26-Jun-2009 Hung-ying Tyan <tyanh@google.com> am e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

Merge commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156'

* commit 'e7565f3c48e6c90e65d9c15e33d20673a187c156':
Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
e7565f3c48e6c90e65d9c15e33d20673a187c156 26-Jun-2009 Hung-ying Tyan <tyanh@google.com> Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.

* Changes
+ Add L2tpActor, L2tpEditor, L2tpIpsecPskActor.
+ Make L2tpIpsecEditor extend L2tpEditor.
+ Revise the code for saving username. Make
VpnSettings.saveProfileToStorage() static.
+ Fix support for screen orientation change in both VpnSettings and
VpnEditor.

Patch Set 2:
+ Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead.
+ Remove unused imports. Wrap lines longer than 80 chars.

Patch Set 3:
+ Fix all the strings according to UI feedback.
+ Remove all the added actor subclasses and move password to editor.
+ Remove VPN entry in Security & location.

Patch Set 4:
+ Misc string fixes.

Patch Set 5:
+ Add strings for credential storage settings.
+ Changed the error dialog icon.
+ Fix "Remember me" indentation in connect dialog.

Patch Set 6:
+ resolve res/values/strings.xml
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
620965ccc58a7623d564300eeee97ab5d77e1480 26-Jun-2009 Chouting Zhang <MichaelZhang@motorola.com> am 386278a3: CDMA Settings additions

Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4'

* commit '386278a338d740dce95b7fa1514662b0eb5683e4':
CDMA Settings additions
386278a338d740dce95b7fa1514662b0eb5683e4 24-Jun-2009 Chouting Zhang <MichaelZhang@motorola.com> CDMA Settings additions

This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d75fb2f92f237ea9c818551f1826f991be57284c 25-Jun-2009 Mike Lockwood <lockwood@android.com> Settings: Add preference to enable/disable assisted GPS.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
41b6daa69213f58d6e0de1ff6c6c720731c971d2 19-Jun-2009 Amith Yamasani <yamasani@google.com> Use new location of USE_LOCATION_FOR_SERVICES setting (Secure).

Due to the need to access the bit from SetupWizard, had to move
the setting to Settings.Secure from Settings.Gservices.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f06d8698a4a2de1973a25df0c6563bdfcba4eb03 12-Jun-2009 Amith Yamasani <yamasani@google.com> Add setting for allowing Google to use location for better search results.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
71e2d3bc3a85b86438ad5be1561b9ea3c967948e 14-Jun-2009 Hung-ying Tyan <tyanh@google.com> Remove LAUNCHER category from VPN settings activity's intent filter.

Also add preference summary to the VPN entry in the security settings.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
1617706d2529b2182d1a7fe2348495fb8f40bb81 10-Jun-2009 Hung-ying Tyan <tyanh@google.com> Add VPN settings classes to Settings app.

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.
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
5ed2c4ad43f2c3c85a025da04becd2eaa75927a1 08-Jun-2009 Mike Lockwood <lockwood@android.com> Listen for changes to location pProvider enabled settings.

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>
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
d13308674b4ff614b6ade32efde0d7cff6d8dc2a 08-Jun-2009 Mike Lockwood <lockwood@android.com> Remove Network Location" opt-in dialog from "Security and Settings"

This dialog is being moved to the Network Location Provider itself.

Signed-off-by: Mike Lockwood <lockwood@android.com>
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
074149da80d6b581b21abe32a68a025ecfd11868 03-Apr-2009 Mike Lockwood <> AI 144372: Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
making LocationManager.updateProviders() unnecessary.
Removed LocationManager.updateProviders()
Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
of enabling or disabling a single location provider.
This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
BUG=1729031

Automated import of CL 144372
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4bfdcd3e5fb344cad88feaf4172427f0be53ac2c 02-Apr-2009 Amith Yamasani <> AI 144257: am: CL 144256 Need to show opt-in screen for location collection.
Added a screen to the setup wizard, after login, to ask user to
opt-in for location collection.
Added a dialog to Settings when user turns on Network location.
Fixed a security permission issue in LocationManagerService related
to this change.
Original author: yamasani
Merged from: //branches/cupcake/...

Automated import of CL 144257
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
f9e024198d3b16454287888bd5d40fee23390d23 02-Apr-2009 Wink Saville <> AI 144185: Integrate cdma into the main code base.

Automated import of CL 144185
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
72ed6feab24308a0acd1fa2135afa3476759cf39 13-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake_rel/...@138607
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
afc4ab2ffbb8327ddce9907961295a32cbf49d0f 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
4e14e5ccbf1ef27220419849133d482a546d5c04 04-Mar-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //depot/cupcake/@135843
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
477296898777d0bdf41fc49c047a6b9374f27fe1 19-Feb-2009 The Android Open Source Project <initial-contribution@android.com> auto import from //branches/cupcake/...@132276
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
abc48f80d8747b4fc051b7dd364355ee667a9bac 18-Dec-2008 The Android Open Source Project <initial-contribution@android.com> Code drop from //branches/cupcake/...@124589
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java
de2d9f5f109265873196f1615e1f3546b114aaa7 21-Oct-2008 The Android Open Source Project <initial-contribution@android.com> Initial Contribution
/packages/apps/Settings/src/com/android/settings/SecuritySettings.java