Commit Graph

7762 Commits

Author SHA1 Message Date
Jim Miller
a04ebb412c am eddb0493: am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reache
* commit 'eddb04934b2b52ab0ff6545515df8f0801f538c0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:22:50 +00:00
Jim Miller
eddb04934b am 93b39ff9: am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRIN
* commit '93b39ff9bd40df755967a4dfe0593b30b0cfa8d2':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:14:27 +00:00
Jim Miller
93b39ff9bd am 01f44efa: am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEO
* commit '01f44efab0673e8648470c8be1670730660a4778':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:08:06 +00:00
Jim Miller
01f44efab0 am 179fa507: Merge "Handle fp enrollment errors more gracefully - When finger can\'t be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enro
* commit '179fa5078b6e105e6e01e82c0af7c43745c452b0':
  Handle fp enrollment errors more gracefully - When finger can't be analyzed for enrollment (FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user to try again or use a different finger. - When timeout is reached (FINGERPRINT_ERROR_TIMEOUT), stop enrollment and ask the user to try again.
2015-09-09 23:02:34 +00:00
Jim Miller
457904634c Handle fp enrollment errors more gracefully
- When finger can't be analyzed for enrollment
(FINGERPRINT_ERROR_UNABLE_TO_PROCESS), tell the user
to try again or use a different finger.
- When timeout is reached (FINGERPRINT_ERROR_TIMEOUT),
stop enrollment and ask the user to try again.

Fixes bug 23546104
Fixes bug 22708384

Change-Id: I879874b53dd0d928093fab1c92d0d4d68d73be28
2015-09-09 15:30:40 -07:00
Alan Viverette
a49cce4f38 Rename night mode back to Night mode
Which is technically correct (the best correct) and appropriately
manages user expectations.

Change-Id: Ic1680bc47a0c7953afc01f3c678f19b0755062f4
2015-09-09 10:27:52 -04:00
Julia Reynolds
ec037c387d Merge "Differentiate battery optimization string." 2015-09-08 17:14:02 +00:00
Julia Reynolds
f08185b8e3 Differentiate battery optimization string.
Bug: 23585186
Change-Id: If98629c7a3204f2600c9d7d9c257de24e826f085
2015-09-08 12:49:32 -04:00
Robin Lee
b5e37f1d45 Merge "Show installed user keys in Security Settings" 2015-09-08 16:03:26 +00:00
Geoff Mendal
f1a62026b8 Import translations. DO NOT MERGE
Change-Id: Id6db6ab56902ac4bc1775dc6fdcac0e487329660
Auto-generated-cl: translation import
2015-09-07 08:35:11 -07:00
Geoff Mendal
76381c3f42 Import translations. DO NOT MERGE
Change-Id: Ide5e5bf4e5da66bfb8246f90da690f447db2e411
Auto-generated-cl: translation import
2015-09-07 07:49:54 -07:00
Maurice Lam
8d6975eb25 Merge "Update setup wizard skip dialog strings" 2015-09-04 19:30:26 +00:00
Maurice Lam
21d27b125f Update setup wizard skip dialog strings
Change "Don't skip" to "Go back".

Bug: 23764890
Change-Id: I899ce893ddeb1cef94d1733871005fd0356ed475
2015-09-04 00:36:43 +00:00
Xiaohui Chen
40aca2ceb4 Remove dead Nsd checkbox
It seems to be dead from few years ago. This cl just cleans things up.
See b/6449478 for context.

Change-Id: Ida5eca16df88c866d3557e12dcde8884706810c6
2015-09-03 11:29:45 -07:00
Maurice Lam
321b27b67c am 570852da: am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '570852da1875ad34d6d1b751e2bacaee8d7a9a1a':
  [Fingerprint] Update strings for skip dialog
2015-09-03 17:28:44 +00:00
Sungmin Choi
56042b8c36 am eeb5f8f1: am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit 'eeb5f8f1a2d31a9231ebb96ce55abe2213900377':
  To hide none security option, use config_hide_none_security_option config
2015-09-03 17:28:43 +00:00
Maurice Lam
570852da18 am 84afdfde: am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '84afdfdefaa935764aff589799b3ccf3a2fa06a1':
  [Fingerprint] Update strings for skip dialog
2015-09-03 06:23:36 +00:00
Sungmin Choi
eeb5f8f1a2 am a43a40ff: am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit 'a43a40ffe7e55a4421635fc0a47ede295f2d61ed':
  To hide none security option, use config_hide_none_security_option config
2015-09-03 06:22:57 +00:00
Maurice Lam
84afdfdefa am 82db64e9: am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit '82db64e940905a18aae4e716f361b6a9a72d0a4e':
  [Fingerprint] Update strings for skip dialog
2015-09-02 23:54:52 +00:00
Maurice Lam
82db64e940 am d8723073: Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev
* commit 'd8723073bb802c0e75df20edbada5e47bd020057':
  [Fingerprint] Update strings for skip dialog
2015-09-02 23:44:06 +00:00
Maurice Lam
d8723073bb Merge "[Fingerprint] Update strings for skip dialog" into mnc-dr-dev 2015-09-02 23:35:15 +00:00
Maurice Lam
df65e153e6 [Fingerprint] Update strings for skip dialog
Bug: 23228889
Change-Id: I6c85dccbda2b5c0ad44ac72ca4107f9dcbb6a1b5
2015-09-02 14:36:19 -07:00
Sungmin Choi
a43a40ffe7 am e31208ae: am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit 'e31208ae1c253b35edd34192f49c14a59bbd8c13':
  To hide none security option, use config_hide_none_security_option config
2015-09-02 21:25:25 +00:00
Sungmin Choi
e31208ae1c am 05c7dde1: To hide none security option, use config_hide_none_security_option config
* commit '05c7dde1f3a6044db7b687dfcbacbde50f3befb1':
  To hide none security option, use config_hide_none_security_option config
2015-09-02 21:02:58 +00:00
Sungmin Choi
05c7dde1f3 To hide none security option, use config_hide_none_security_option config
Use mcc config overlay mechanism to hide none security option
in countries where it is mandatory.
To hide none security option, set config_hide_none_security_option config
true as mcc config overlay.

Bug: 22209425
Bug: 22975388
Change-Id: I774c53e17d3b50393816622134e58f8e06b76fab
2015-09-02 13:51:44 -07:00
Geoff Mendal
e182fa7788 Import translations. DO NOT MERGE
Change-Id: I9f2e39d6875f3f3d6b4eab8c3c29a0155c69d6ce
Auto-generated-cl: translation import
2015-09-02 07:05:31 -07:00
Geoff Mendal
c638c8f7b3 Import translations. DO NOT MERGE
Change-Id: I594aadd6ad5c196e88e6bf08fb46ff8e3964482f
Auto-generated-cl: translation import
2015-09-02 06:20:12 -07:00
Geoff Mendal
f33098eaa0 Import translations. DO NOT MERGE
Change-Id: Id58b50a01ad4217ad851dd8aed6a53b39ce3d426
Auto-generated-cl: translation import
2015-08-31 07:07:58 -07:00
Geoff Mendal
96c4330eef Import translations. DO NOT MERGE
Change-Id: I39fa6b9b72e50d1ded02a2701ac6ac989a31861b
Auto-generated-cl: translation import
2015-08-31 06:23:03 -07:00
Geoff Mendal
96edf80773 Import translations. DO NOT MERGE
Change-Id: Idee4ab4cd6915f02efac37f747640077a33cb75a
Auto-generated-cl: translation import
2015-08-29 08:38:50 -07:00
Geoff Mendal
91971bc0e3 Import translations. DO NOT MERGE
Change-Id: Ia3254d8fb04749c16c9e5a123de212adce9b33f6
Auto-generated-cl: translation import
2015-08-29 07:54:23 -07:00
Maurice Lam
566af8ce2a am 2fef0595: am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '2fef059543bc859d5723246a635d0e1773f623de':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:48:17 +00:00
Maurice Lam
2fef059543 am 07c2561d: am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '07c2561d80fba5b3764177aa03dc4496cbe9b47e':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:41:42 +00:00
Maurice Lam
07c2561d80 am 8cea65f9: am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '8cea65f99f23c1a86d7a760b2dba89fa83036959':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:31:35 +00:00
Maurice Lam
8cea65f99f am 3087a4e0: Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev
* commit '3087a4e0fd792531e567c7b508dd1e65b7fcf515':
  [Fingerprint] Add skip dialog during SUW
2015-08-28 22:24:52 +00:00
Maurice Lam
3087a4e0fd Merge "[Fingerprint] Add skip dialog during SUW" into mnc-dr-dev 2015-08-28 22:13:19 +00:00
Maurice Lam
48cf33a94e [Fingerprint] Add skip dialog during SUW
During setup wizard, add a skip dialog to confirm whether the user
wants to skip fingerprint setup or not.

Bug: 23228889
Change-Id: I2c1c26522b085e722e7bd7b34a26d2a38412bee4
2015-08-28 12:39:21 -07:00
Geoff Mendal
db044ffbc6 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 23544168
Change-Id: Iade81d81334be9289e7381f05931257154f72a6f
2015-08-28 03:06:04 -07:00
Robin Lee
baefdcf9eb Show installed user keys in Security Settings
This makes removing a particular keyset possible without deleting the
whole keystore along with it.

Bug: 22541933
Change-Id: I248803cb27efdd1695438dfc82951887dc579f99
2015-08-26 16:22:19 +01:00
Geoff Mendal
fbfdede15b Import translations. DO NOT MERGE
Change-Id: I1d08cdfb6ad7723d4e0bd578b0b699fc9d2389db
Auto-generated-cl: translation import
2015-08-26 07:12:08 -07:00
Geoff Mendal
5dda1fa870 Import translations. DO NOT MERGE
Change-Id: Ib5bcf56683aab565a59b874cf85529d4dd2d2fb6
Auto-generated-cl: translation import
2015-08-26 06:21:28 -07:00
Wei Liu
9dde0669f2 am 656c805b: am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '656c805bf38dd299ae25fbe39806650122aa6314':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:45:34 +00:00
Wei Liu
656c805bf3 am 70238114: am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '702381144781d68551e765dcf8b23cf3dbca3ce5':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:37:40 +00:00
Wei Liu
7023811447 am 6e58d516: Refactor UidDetailProvider and its dependencies to SettingsLib.
* commit '6e58d516f05bbceabdddd3aa08a94fcc32858e71':
  Refactor UidDetailProvider and its dependencies to SettingsLib.
2015-08-25 18:32:41 +00:00
Wei Liu
6e58d516f0 Refactor UidDetailProvider and its dependencies to SettingsLib.
so that it can be reused by Wear app data usage.

Change-Id: Id05f888274e15fbeffa175ee8073de02a8966867
2015-08-25 11:02:59 -07:00
Geoff Mendal
9a86c08593 Import translations. DO NOT MERGE
Change-Id: I14e14a1e5f548b559939584de4a209990318f799
Auto-generated-cl: translation import
2015-08-24 07:16:24 -07:00
Geoff Mendal
51da0c2917 Import translations. DO NOT MERGE
Change-Id: Id4904959b7d44389738951332e67247f76ca61cd
Auto-generated-cl: translation import
2015-08-24 06:22:32 -07:00
Selim Cinek
494bcecba5 am c118c90c: am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'c118c90c9bda1bdea7f84469988670fab7b48c61':
  Adapted string length translation limits
2015-08-20 19:59:55 +00:00
Selim Cinek
c118c90c9b am 6ee587a0: am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
* commit '6ee587a01d74ef0aa813f2057989b59ed061e9df':
  Adapted string length translation limits
2015-08-20 19:28:36 +00:00
Selim Cinek
6ee587a01d am a5e3aca4: am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'a5e3aca4f8d49d1b4b092d8353e117ed77ac2e8a':
  Adapted string length translation limits
2015-08-20 19:19:32 +00:00