Commit Graph

108 Commits

Author SHA1 Message Date
Paul Lawrence
08c6ab0fea Fix back button on crypto screen
Did not reenable after entering wrong password.

Bug: 12434219
Change-Id: If8b0c22213a345b3dd0f92e02710c155c7adcd1c
2014-07-08 22:17:35 +00:00
Paul Lawrence
5a70f05e0d Fix assorted problems on Crypto screen
Show keyboard on retry with PIN or password
Show correct message on cooldown
On return from emergency call, don't override cooldown
Don't show keyboard on return from emergency call if in cooldown
Show back functionality on emergency call

Change-Id: I5cc93cb09ad758b72521bd43cfad1040be2e5f8d
2014-06-17 18:33:28 +00:00
Paul Lawrence
f6cda3b176 Remove crypto pattern after two seconds
Currently pattern is left on after a failed attempt. This change removes
it after a timeout.

Change-Id: I77830510b17396f6e64a482816f6041af0fdc166
2014-06-17 18:32:55 +00:00
Paul Lawrence
b15c68fbf1 Show time to go while encrypting drive
Bug: 15159008
Change-Id: I9bb6f86c2941cbd93572c25716d21691a4fefbef
2014-06-05 20:15:37 +00:00
Paul Lawrence
f5ca71751e Adding comment
To enable marquee'ing, you have to call setSelected on the relevant control.
Comment added to explain this. Also see defect 15327172 filed against
SDK documentation to properly explain this.

Change-Id: If8f70baa1b682070b312fa689b2edd77b50d2d6e
2014-06-02 09:33:13 -07:00
Santos Cordon
5a1233e7df am 3afbdf00: Update showCallScreen to use Telecomm (6/6)
* commit '3afbdf006057c93f930694e26306a3cc9cea34e4':
  Update showCallScreen to use Telecomm (6/6)
2014-05-30 21:32:50 +00:00
Santos Cordon
3afbdf0060 Update showCallScreen to use Telecomm (6/6)
Use TelephonyManager instead of ITelephony for showCallScreen so that
the invocation routed to telecomm instead.

Bug: 15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
2014-05-29 22:35:43 -07:00
Paul Lawrence
7836ae8b55 Fix marqueeing of OwnerText on CryptKeeper screens
Have to call setSelected to make marqueeing work.

Change-Id: Ic00012c150a9cacfff2b11f2938ea0674a1f45e9
2014-05-29 10:19:08 -07:00
Paul Lawrence
c9cf31ca55 Merge "Improve power fail/reset" 2014-05-19 14:22:46 +00:00
Paul Lawrence
73456acfb4 Improve power fail/reset
On power fail/reset, an encrypted device will sit at the enter password screen
indefinitely, chirping. This is designed to attract the attention of the user.

However, it also flattens the battery, and the user who's attention is not
drawn will discover a discharged phone the next morning. We have had many
complaints about this.

Keep current functionality, but power down after 10 minutes. It's a compromise,
but seems reasonable.

@bug 12582489

Change-Id: I895c0147bed978ecf6984af2c748f971dfa0d221
2014-05-16 11:43:21 -07:00
Paul Lawrence
04425f1617 Fixing decryption messaging
Messaging currently implies encryption only works with PIN or password
(K functionality). Now that in L we support encryption with PIN, pattern,
password or swipe/none, we need to update the strings accordingly.

@bug 14257692
@bug 13674657

Change-Id: I055db1289c2c2750d217b50b653a7f36ff304aca
2014-05-16 09:22:49 -07:00
Paul Lawrence
9ac2d81d9f Show OwnerInfo on CryptKeeper screen
Depends on framework change from
  https://googleplex-android-review.git.corp.google.com/#/c/435138/

Bug 13526708

Change-Id: I16189b629b5515ec5175e05155ba4ec0c27d22fb
2014-04-01 13:47:01 -07:00
Paul Lawrence
dafbc9b02d Merge "Handle pattern cooldown correctly" 2014-03-20 13:33:54 +00:00
Paul Lawrence
2daf2641d3 Handle pattern cooldown correctly
We need to disable pattern control when in cooldown. We also need
to hide the back button completely in pattern mode.

Bug: 13329798
Change-Id: Idefea60d95db1810d340c69cc730a286011363db
2014-03-14 09:20:24 -07:00
Paul Lawrence
e54e9323ed Don't show IME on pattern
Bug: 13327729
Change-Id: Ie83dda98558b66c824c15975310a8fb1835e900f
2014-03-13 14:05:48 -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
Jim Miller
fb3d5cad48 Don't show keyguard on top of CryptKeeper
The fix in Change Ifbe4cdf40e3b76d2069ecace940f85fa58f31187 causes
keyguard to be more aggressive about showing itself.

CryptKeeper itself should explicitly dismiss keyguard.

Fixes bug 11680832

Change-Id: I87287762b73bdffc6f1800379f02f70f4bd873a8
2013-11-14 14:40:22 -08:00
Alon Albert
66d050bb4b Hide Camera in CryptKeeper
Bug: 10993393

Change-Id: Idaddd01f099ae40283eb86fd92232845f9d436b8
2013-09-30 17:57:14 -07:00
Vikram Aggarwal
bf459dafdc Remove back button entirely when disabled
Bug: 7480506 Encryption screen shows back button
Change-Id: Iba2706fd6b61303178b472071f32d65bdf72e50d
2012-11-09 14:40:22 -08:00
Vikram Aggarwal
86508085ea Remove further logging
Bug: 7302014 CryptKeeper logs PII data

Change-Id: Ifb18c428c70e97f28ceeced2fa0aa6e9247a5372
2012-10-08 12:59:54 -07:00
Vikram Aggarwal
c3ebad20f2 Remove verbose logging
Bug: 7302014 CryptKeeper logs PII data

Change-Id: I4dec3a827a5b6880b1c0995b8adebf34315c4773
2012-10-08 09:13:07 -07:00
Christopher Tate
6a5929b086 Update Settings app to use new namespace for airplane-mode settings
Bug 7132230

Change-Id: I0253637e6d464afc229cf11ffe69852bf44fe261
2012-09-10 15:46:17 -07:00
Wink Saville
5543404ae0 Use telephony-common
Change-Id: Ic95136fd5934afdd53a08bfd640d40add67fdb44
2012-07-11 15:08:15 -07:00
Vikram Aggarwal
f576dd6c9f Show keyboard selectively, do not listen on MCC/MNC changes, show text to user.
Fix b/6531158 (Stop showing the keyboard)

Fix b/6532201 (Stop removing the text view, and prompt the user with a message)

Fix b/6155075 (Stop listening to MCC/MNC changes)

Change-Id: Ibf8414fe57bdd0acf6c20f3194c52b168b9292c6
2012-05-22 14:37:19 -07:00
Vikram Aggarwal
d1147250dd Delay audio notification on user interaction
Fix the eng pieces of bug 6445429.

Change-Id: I1963d2e701e4b4639cdc75cc3161668d0601747d
2012-05-08 16:03:18 -07:00
Vikram Aggarwal
6ebbd30e18 Write the airplane setting in addition to sending the Intent.
dab was right. :)

Fix b/6006192 in association with https://android-git.corp.google.com/g/187160

Change-Id: I3edfb3191ab35a4e5de1b18f3e2e1dae5f882354
2012-05-04 14:15:55 -07:00
Vikram Aggarwal
8b399cc71c Merge "Go into airplane mode in minimal boot mode." into jb-dev 2012-05-04 14:05:49 -07:00
Vikram Aggarwal
ea1186db19 Go into airplane mode in minimal boot mode.
Fix b/6006192

Change-Id: Ied4d9b51aac4e8ac1d2114aa1e95d4ebbe93413b
2012-05-04 09:18:17 -07:00
Vikram Aggarwal
c62d321e8d UI fixes for tablets
1. Center the clock on Xoom and large tablets. Fix b/5579000

2. Correctly remove the emergency call button if the device (*cough*
   Nakasi *cough*) does not have telephone capability.

Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
2012-05-03 12:48:48 -07:00
Vikram Aggarwal
86b93937fa Notification alert every 5s and start after 30s.
Justification: Most users will not need prompting, so for them a
notification will be an annoyance.  So we only notify if the no
password has been entered for 30 seconds.

Once a notification sound is made, we need to make it frequently so
the user can locate the device.

Change-Id: Ibf531aec89b5e3b3c72eaa36016bcc4cac1d6493
2012-05-02 09:42:32 -07:00
Vikram Aggarwal
de3c9cb412 Notify user when waiting for decryption password
1. Disable back presses from physical keyboard during encryption: Fix b/6139810
2. Keep screen on when waiting for password. Fix b/6153213 and b/6149606
3. Alert the user with sound when waiting for password. Fix b/6149606
4. Add debugging feature to display the password screen without having to reboot the device.

Change-Id: I588aa7d96e1140f95a6fa91e0281117907f666f7
2012-05-01 16:05:44 -07:00
Vikram Aggarwal
b96b35a62b Enable back in CryptKeeper
Fix b/6280906

Change-Id: I38d75c4b4c928c77c20bf8eca2649bf6eaa95507
2012-05-01 11:12:09 -07:00
Vikram Aggarwal
9f55ae2878 Fix crash due to lost activity.
Change-Id: I9d0c2941bf3d725c506b15a738e6ab41678d76d1
2012-04-02 13:36:35 -07:00
Vikram Aggarwal
bfa3a64310 Minor changes to improve CryptKeeper readability
Change-Id: I8a056216edf7f557c32bdec9387b0d31de7aa6c6
2012-03-30 13:11:44 -07:00
Dianne Hackborn
644fa4243b Work on issue #5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.

Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
2011-10-18 13:41:26 -07:00
Dianne Hackborn
140f6c6cf7 Fix issue #5460725: Crespo does not fully boot after a wipe
Add a hack to relaunch whatever was supposed to be launched
(presumably home) when CryptKeeper discovers it shouldn't be
running.

Change-Id: I1406b8d6e8d484ed1c169fa4908a9e05e8c7c2ad
2011-10-16 11:55:33 -07:00
Daniel Sandler
4d2bfd1491 Use new status bar disable flags.
Requires frameworks/base change I04eb2245.

Bug: 5380495
Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344
2011-10-12 15:40:41 -04:00
Ben Komalo
9ee164f44e Properly initialize wakelock for cryptkeeper.
Bug: 3385856
Change-Id: I6dc39b02b81e290af0b47f6a6c9ba2da3e7c65c3
2011-09-21 10:40:50 -07:00
Ben Komalo
d4758efef6 Don't try to talk to vold mid-encryption.
We were attempting to unconditionally validate the encryption state on
CryptKeeper bringup, which required MountService to talk to vold. For
some reason, during encryption, this cannot happen, and that call never
returns, so the CryptKeeper UI was never brought up.

Bug: 5276690
Change-Id: I6a146e25e24f4efd760b0afa1e1409bf9ea3e9c3
2011-09-11 17:16:27 -07:00
Ben Komalo
0e66609c95 Show factory reset option if encryption went bad.
Also update the wording for the error message

Bug: 3384231
Change-Id: I25a67cba7abede913bdd8cadaafc42bcbd5c5c5f
2011-09-06 17:45:15 -07:00
Ben Komalo
9fcb6a7fac Misc fixes to CryptKeeper
- use standard IME, but force it into ASCII if it's the default IME
- provide an IME switcher if there are multiple IME's, in case the
ASCII-capable one is a different one
- make the IME shown by default

Bug: 5004456
Bug: 4698473
Change-Id: Id40a164cfe599bfdb67b81f60d4ab8a52208de88
2011-08-29 15:14:18 -07:00
Ben Komalo
0460675b7c Stop leaking wakelocks in cryptkeeper.
Also add in logging for certain events, as well as progress update to
help hunt down a stuck-in-progress bug

Bug: 5163155
Change-Id: I2e01a56b012f41f178beba0becfbe8173a1715ee
2011-08-18 14:53:53 -07:00
Ben Komalo
f0104df823 Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken

Bug: 5174783
Bug: 4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
2011-08-17 11:08:26 -07:00
Ben Komalo
91a2f0566a Allow CryptKeeper to be started for UI debugging
Change-Id: I3ca6e00018da39123b470c3960c00c8cd43f9f72
2011-08-17 10:42:22 -07:00
David Brown
8373b45169 Add "emergency call" button to CryptKeeper
This allows you to make an emergency call without needing to decrypt
your device first.

The exact appearance of the button, and the two possible icons shown to
the left of the text, are taken directly from the corresponding
framework resources (see keyguard_screen_*.xml, ic_emergency.png, and
stat_sys_phone_call.png.)

Also, the code in CryptKeeper.java for updating the state of, and
handling clicks from, the "Emergency call" button is mostly duplicated
from the corresponding code in LockPatternUtils and
LockPatternKeyguardView under frameworks/base.

Bug: 4494186
Change-Id: I36a713fdbc3281a7ba46762d47d5b61fb3cd194d
2011-06-24 16:18:30 -07:00
Jason parks
00046d6e17 Get encryption working for phones.
I've removed the "special" keyboard from the phone
layouts for now.

Change-Id: I4b18279dafb18ba7cebacfad1b7167e34a7203b4
2011-06-13 17:39:25 -05:00
Jason parks
06c5ff4a46 Partial fix for Bug 3495575.
Move the decrypt attempt to a AsyncTask. This will
unblock the UI thread in order for the device to
still be "responsive". There is still the issue of
decrypt taking 3+ seconds before it returns to. The
delay is still there becfore the fade but the text
field is now cleared and you can tap on keys.

Bug: 3495575
Change-Id: Icec82e83d3a09b3c0f856aa77870925fc8469625
2011-03-01 10:17:57 -06:00
Jason parks
75c085ee89 There can only be one.............................
KEYBOARD!

Bug: 3413847
Change-Id: I3d427f449c6cdbad0770f087d1139dc94be50e80
2011-02-10 14:37:45 -06:00
Andy Stadler
9597406aa1 Restart encryption display after screen power cycle
Bug: 3414241
Change-Id: I881fc14c3e0850089b98fcbdbd86c39dde22771c
2011-02-01 17:35:20 -08:00
Andy Stadler
1499740c13 Preserve wakelock through rotation
Bug: 3381450

Change-Id: Iea09d050231dfe31848666bdb186a5531d90e7bc
2011-02-01 15:34:59 -08:00