Commit Graph

107 Commits

Author SHA1 Message Date
Maurice Lam
7b484b9af0 Merge "[FRP] Theme interstitials for lock screen setup" into lmp-mr1-dev 2014-12-03 01:27:57 +00:00
Maurice Lam
ecd2b7b81f [FRP] Theme interstitials for lock screen setup
Use the setup wizard theme for EncryptionInterstital and
RedactionInterstitial as they will show during the lock screen setup
as part of setup wizard.

Bug: 18482708
Change-Id: I65c8924952345a4e17fcf4ffb7d68df53244c5d7
2014-12-01 20:24:08 -08:00
Lucky Zhang
3bcea0289b [FRP] Show FRP warning when disabling secure unlock
Added a dialog fragment to display warning message about disabling
device protection features when changing from a secure unlock
method to an insecure one.

Bug: 18509782
Change-Id: I0eaa9ff55c14092d8b3361d10da8b4530dd79bee
2014-12-01 18:49:10 -08:00
Maurice Lam
6b19fa9017 [FRP] Theming for Pattern and Password screens
Basic theming for pattern and password screens. Create subclasses for
ChooseLockPassword and ChooseLockPattern, and copied their XML
layouts.

This CL mainly uses the buttons in the original screens as-is, with a
follow-up CL coming to change to use the nav bar buttons.

Bug: 18482708
Change-Id: I81751f781de633aff23fc68657589360007c235a
2014-12-01 16:18:27 -08:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
Jim Miller
602d559d9c Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev 2014-10-17 23:48:35 +00:00
Jim Miller
0698a21631 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
2014-10-17 16:11:59 -07:00
Svetoslav
40ca78f6f3 Accessibility no longer overrides strong encryption (Settings).
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.

bug:17881324

Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
2014-10-17 14:41:58 -07:00
Jim Miller
46c7f6d6f3 Add a checkbox option to 'require password to decrypt'
Fixes bug 17881324

Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
2014-10-14 18:40:30 -07:00
Svetoslav
5244844268 Use default encryption password if an accessibility service is enabled.
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.

bug:17671790

Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
2014-09-30 23:03:37 +00:00
Nicolas Prevot
8fd852e7c2 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
2014-07-09 17:38:49 -07:00
Fabrice Di Meglio
0897f975c1 Add Indexing and Search for ChooseLockGenericFragment
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources

Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
2014-05-23 18:17:09 -07:00
Fabrice Di Meglio
15826d4ea1 Mode code cleaning: remove obsolete references to EXTRA_NO_HEADERS
- the EXTRA_NO_HEADERS flag as no more meaning as we are showing
the Tiles (previously named "Headers") only in the Dashboard
(which is the main Settings screen)

Change-Id: I55656de0d28ca9c84adbe6647d870838b4ac230b
2014-05-13 13:10:34 -07:00
Elliott Hughes
57d7fa545b resolved conflicts for merge of f90b5141 to master
Change-Id: I666b2fcde034f6dc9f7b69409facf88a4feb5309
2014-04-24 17:24:35 -07:00
Elliott Hughes
309004706c Track MutableBoolean's new package.
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Paul Lawrence
b05f39d186 Support default, pattern, pin and password encryption types
Use plumbing provided by dependant change to bring up correct dialog
at boot time.

Needs matching framework changes from
 https://googleplex-android-review.googlesource.com/#/c/412885/

Bug: 8769627
Change-Id: Ib04a2875e051a7cccca035fadb25978dfec22491
2014-02-11 10:27:58 -08:00
Fabrice Di Meglio
263bcc8b73 Use Drawer in Settings app
- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header  validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
2014-02-03 16:36:46 -08:00
Amith Yamasani
66026773bb Make sure that external callers cannot pass in the confirm bypass extra
Security fix for vulnerability where an app could launch into the screen lock
change dialog without first confirming the existing password/pattern.

Also, make sure that the fragments are launched with the correct corresponding
activity.

Bug: 9858403
Change-Id: I0f2c00a44abeb624c6fba0497bf6036a6f1a4564
2013-09-25 14:05:33 -07:00
Amith Yamasani
39272d07d7 Fix incorrect comparison
Bug: 10446469

Screen lock options should have been locked down when encryption is
enabled. An incorrect comparison (== instead of equals) caused it
to always bypass encryption quality check.

Change-Id: I7f3856146181a92183555f30bbc50d58bfe0c3d5
2013-08-23 18:07:30 -07:00
Amith Yamasani
12411fba8e Don't apply encryption password requirements for secondary users
Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a
2013-08-15 15:35:49 -07:00
Amith Yamasani
a677ee210c Whitelist fragments appropriate for an activity
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
2013-07-30 16:24:58 -07:00
rich cannings
27d6f8d54b Add EventLog to report lock screen type
Bug: 9075747
Change-Id: I7d3667211e76b13ccd659713c35ca86246e31e0b
2013-06-05 13:01:44 -07:00
Danielle Millett
12c1451f1f Removing tutorial for choosing a pattern as part of b/7459863
Removing the tutorial that is shown the first time a user sets up
a pattern as their lock type.

Change-Id: If73c936e41458af729740fe5b178b9452c7dd2c0
2012-11-21 15:44:16 -05:00
Jim Miller
783ea85bec Disable the "none" security selection in settings when there's only 1 user
Fixes bug 7454567

Change-Id: Ifffa1403af8d45bc3c7da1f459b87f0a2c064b80
2012-11-02 13:19:32 -07:00
Amith Yamasani
c666c65fab Reduce jank in security lock selection by finishing on return
Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.

This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.

Bug: 7342594

Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
2012-10-24 13:57:01 -07:00
Jim Miller
47f1cd4325 Fix 6291333: Don't show multiple pin/pattern/password confirmations
This fixes a bug where orientation changes caused the system to
ask for the pin/pattern/password multiple times.

It also fixes a minor issue where we were showing buttons
on the pattern confirmation screen (bug 6218057)

Change-Id: I0894f37bb697baa4cc17917aaeb466440279b092
2012-04-27 18:11:03 -07:00
Amith Yamasani
b0b37ae21c Help menus for several screens.
Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
2012-04-23 15:35:36 -07:00
Steven Ross
94c0548224 Allowing FaceUnlock with a PIN fixes 5467194
We need to allow FaceUnlock if the backup lock supports encryption (PIN).
This requires changing the way the minimum encryption quality is enforced
to allow FaceUnlock as long as the backup lock is a PIN, as FaceUnlock
is considered a lower security than the minimum for encrypted drives.
This change adds some complexity to upgradeQualityForEncryption because it's
used in two places: once to grey out selections that aren't sufficient
security level, and second to force the user to use a higher security level.
This still increases the minimum security level,
but makes an exception for FaceUnlock if it's allowed without encryption.

This uses a MutableBoolean to provide a mutable boolean capability.
We could instead write a custom one or use some other type of mutable
boolean if it exists.

In CryptKeeperSettings, using getKeyguardStoredPasswordQuality directly instead
of getActivePasswordQuality is simpler, but this uses a more complex approach
with a minor tweak as jaggies suggested it and it is clear about the
biometric exception being made.

Change-Id: Ia2645d6bd98857c79c6a9be45eda98087bfe517a
2011-11-30 19:48:38 -05:00
Danielle Millett
487b16f340 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
2011-11-07 17:29:22 -05:00
Steven Ross
1999577979 Using same task fixes 5486287
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
2011-11-04 10:28:32 -04:00
Danielle Millett
80412e70db Fix 5466557: Removed secondary screenlock settings labels
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time

Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
2011-10-17 20:57:17 -04:00
Danielle Millett
b965e1ccd7 Merge "Showing tutorial for Face Unlock on first try" 2011-10-04 18:45:03 -07:00
Danielle Millett
c82ba86375 Showing tutorial for Face Unlock on first try
Change-Id: Idf072750e70a9e5bc7699675d8a7a9c57900eea3
2011-10-04 21:00:07 -04:00
Steven Ross
2d53e1a5d2 Merge "Formatting fix" 2011-10-04 13:03:38 -07:00
Steven Ross
7caac4c19d Formatting fix
Change-Id: If2869f2d6d6bc788cfffc1187b4de1deb9cec83b
2011-10-03 06:50:47 -04:00
Danielle Millett
0fb158a685 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
2011-09-30 17:47:45 -04:00
Steven Ross
31dac17c4b Delete the temp gallery on return from fallback
Change-Id: Id501302aa8c5606006f3e403e51bb01981bc173e
2011-09-30 15:51:57 -04:00
Steven Ross
c5df3daa02 Merge "calling back SetupFaceLock to clean up temporary gallery" 2011-09-30 11:08:58 -07:00
Amith Yamasani
cf26bb2dcc Remove "Screen lock" category header as the title is sufficient.
Bug: 5203189

Insert a descriptive text as a header view when in weak biometric
fallback case.

Change-Id: Ic10cc7d276975b13c188bd15016fea2200ec0e5b
2011-09-29 15:19:07 -07:00
Steven Ross
c620ba41ce 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
2011-09-29 16:01:13 -04:00
Danielle Millett
940407eb6a Changed header to specify backup lock
-Changed main header to show backup lock text
-Reworded normal header
-Changed instances of FacePass to FaceLock

Change-Id: I66cbd3ada87df30b6b7ceb1a784d365ba60a8f41
2011-09-26 18:06:37 -04:00
Danielle Millett
5bae8739ea Adding info explaining facelock's backup lock
This changes the security picker when selecting a backup lock for facelock
such that it says back up lock and gives a brief description of why it's needed.
This is currently a temporary way to display the info and will need to be changed
for the final release.

Change-Id: I6373f97caec088482d36c65bd210c79238c623cf
2011-09-16 16:01:14 -04:00
Danielle Millett
c474a88c2d Fix 5316440: Fix for facelock setup asking to confirm password twice
Change-Id: I6df292b80349a9d20b470d9261ecdca960b5dea5
2011-09-14 14:45:47 -04:00
Jim Miller
5541a86efe 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
2011-09-08 23:47:47 -07:00
Gilles Debunne
6465054995 Bug 5050590: wrong title for lock screen
Change-Id: Iba170a25ac56db4140ab91f4fd583c0f676b02b0
2011-08-23 11:01:41 -07:00
Brian Carlstrom
d4023b7cca 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
2011-06-01 10:47:42 -07:00
Andy Stadler
6370c87a6b Maintain password quality while encrypted
Bug: 3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95
2011-01-21 16:25:22 -08:00
Jim Miller
17e9e19330 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
2010-12-08 16:45:52 -08:00
Jim Miller
3970c38840 Fix 3024522: Add new "Off" setting to LockScreen options.
This allows the user to tell the device to not show lock screen
at all as long as the DevicePolicyManager allows it.

Change-Id: Id46002500b47fc955565be197ac78b7b13b6757d
2010-11-19 18:59:24 -08:00
Konstantin Lopyrev
57fbf694a5 Change I546ee2fb: Fix 2677197: Adding minimum complex character support.
Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
2010-05-27 16:04:49 -07:00