Commit Graph

7847 Commits

Author SHA1 Message Date
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
Selim Cinek
a5e3aca4f8 am dba47d0c: am 19551115: Adapted string length translation limits
* commit 'dba47d0c7fe5c3b21d4b274cfdd9a84232644395':
  Adapted string length translation limits
2015-08-20 19:11:58 +00:00
Selim Cinek
dba47d0c7f am 19551115: Adapted string length translation limits
* commit '19551115dbb3d848be084462342d41addeb1caf6':
  Adapted string length translation limits
2015-08-20 19:04:30 +00:00
Selim Cinek
19551115db Adapted string length translation limits
Bug: 23298302
Change-Id: Id7651b28bab6e4ff37e94b30d68509ae959c6d70
2015-08-20 18:57:22 +00:00
Maurice Lam
6ead34139c am 1b060c09: am 537b5d6e: am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '1b060c09f64ce953fafb52fb5a373ff0256de881':
  [Fingerprint] Smaller enrolling ring
2015-08-20 00:20:07 +00:00
Maurice Lam
1b060c09f6 am 537b5d6e: am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '537b5d6eaea1d042fa915ef01016cfd8f88161fe':
  [Fingerprint] Smaller enrolling ring
2015-08-20 00:13:21 +00:00
Maurice Lam
537b5d6eae am 4d06defe: am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit '4d06defe88b46ec877e0bb6e1ac095bd650ab9df':
  [Fingerprint] Smaller enrolling ring
2015-08-20 00:08:43 +00:00
Maurice Lam
4d06defe88 am d809de88: Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev
* commit 'd809de884761f290a94f01f21b5c94e262ec22ea':
  [Fingerprint] Smaller enrolling ring
2015-08-19 23:59:13 +00:00
Maurice Lam
d809de8847 Merge "[Fingerprint] Smaller enrolling ring" into mnc-dr-dev 2015-08-19 23:51:30 +00:00
Geoff Mendal
d401a062c7 Import translations. DO NOT MERGE
Change-Id: I9ab62b9e28b5dd6f8cd2a54e1ae7e015b8730e03
Auto-generated-cl: translation import
2015-08-19 07:08:00 -07:00
Geoff Mendal
1ca2c0d362 Import translations. DO NOT MERGE
Change-Id: I45f139d94c0d59401f7438b8913c8bbd1f338e94
Auto-generated-cl: translation import
2015-08-19 06:14:20 -07:00
Maurice Lam
27fa865db7 [Fingerprint] Smaller enrolling ring
Make the enrolling progress ring smaller in sw400dp during setup.

Bug: 23216520
Change-Id: I01a862baf9ea3e75e2164d12b7ef13dee5f28c5a
2015-08-18 18:30:36 -07:00
Zachary Kuznia
5adcb3d353 Allow manual to be read from disk
b/22891924

Change-Id: I6014690735403b772f273addba01706441898e23
2015-08-17 18:20:37 -07:00
Geoff Mendal
3c27420773 Import translations. DO NOT MERGE
Change-Id: Ic048bcec759963a76125600eb86b952a2aec5759
Auto-generated-cl: translation import
2015-08-17 07:05:00 -07:00
Geoff Mendal
e8a03d224d Import translations. DO NOT MERGE
Change-Id: I43b55b016758b18892141f67662f8b435212e8ca
Auto-generated-cl: translation import
2015-08-17 06:16:08 -07:00
Julia Reynolds
ab60fe2a14 Use a button style that visibly shows when the button is disabled.
Bug: 21199007
Change-Id: I5bcfa4cfcc7b39eaadae8b8af4c13591f497fee8
2015-08-14 09:55:37 -04:00
Todd Kennedy
9b47830a2d Merge "Fix string for translation" 2015-08-13 19:57:37 +00:00