Geoff Mendal
e37e12321b
Import translations. DO NOT MERGE
...
Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import
2015-07-24 16:56:10 -07:00
Selim Cinek
01de6ef30a
Autocapitalizing the fingerprint names now
...
Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
2015-07-24 16:50:16 -07:00
Selim Cinek
21574cdb37
Added content description for the fingerprint icon
...
Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804
2015-07-24 16:30:22 -07:00
Adrian Roos
38c9b9eb5e
Update FRP warning to spec
...
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
2015-07-24 15:09:34 -07:00
Colin Cross
dab025bdff
resolved conflicts for merge of 769ba03b to master
...
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Jason Monk
769ba03b8f
am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Jason Monk
0557f4c353
am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
Remove tuner from development settings
2015-07-24 03:26:23 +00:00
Jason Monk
b46b993403
am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
Remove tuner from development settings
2015-07-24 03:03:23 +00:00
Geoff Mendal
28718aebd1
Import translations. DO NOT MERGE
...
Change-Id: I52c34f9ee160ac6f8ce81d8922a6d363ca0f348f
Auto-generated-cl: translation import
2015-07-23 18:23:19 -07:00
Geoff Mendal
5376d54e8e
Import translations. DO NOT MERGE
...
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
2015-07-23 18:10:24 -07:00
Geoff Mendal
e9f9ea3aff
Import translations. DO NOT MERGE
...
Change-Id: Ib963e118d1a07d17e7fa824a39f72d6611366804
Auto-generated-cl: translation import
2015-07-23 17:57:24 -07:00
Selim Cinek
b48e9fdcab
Adapted a string in the fingerprint enrollment flow
...
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
2015-07-23 15:29:01 -07:00
Maurice Lam
95d1eb90d3
am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:26:15 +00:00
Maurice Lam
1f95e5125f
am 3f7ff2b6: am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit '3f7ff2b60f85cf9bb39e3bb3551bcdbfa916fafa':
[ScreenLock] Update illustration during setup wizard
2015-07-23 20:26:12 +00:00
Maurice Lam
cff4eb9b73
am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:09:28 +00:00
Maurice Lam
3f7ff2b60f
am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
[ScreenLock] Update illustration during setup wizard
2015-07-23 20:09:26 +00:00
Maurice Lam
ea0f0fdfa2
am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:46:31 +00:00
Maurice Lam
391e65e465
am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'a5fa39dd13552886ebe9903fcbd6084a9521fd16':
[ScreenLock] Update illustration during setup wizard
2015-07-23 19:46:28 +00:00
Maurice Lam
7a33511397
am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
[ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:18:51 +00:00
Maurice Lam
a5fa39dd13
am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
[ScreenLock] Update illustration during setup wizard
2015-07-23 19:18:48 +00:00
Jason Monk
6d8fdb8294
am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
...
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
Remove tuner from development settings
2015-07-23 19:13:05 +00:00
Maurice Lam
9b6bd390f9
am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
...
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
[ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:23:18 +00:00
Maurice Lam
ad904de846
am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
...
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
[ScreenLock] Update illustration during setup wizard
2015-07-22 20:23:15 +00:00
Jason Monk
838c843217
Merge "Remove tuner from development settings" into mnc-dev
2015-07-22 19:29:59 +00:00
Maurice Lam
9e1429a54b
Merge "[Fingerprint] Add strings for fingerprint during SUW"
2015-07-22 18:27:43 +00:00
Maurice Lam
760c4f1b5d
[Fingerprint] Add strings for fingerprint during SUW
...
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
2015-07-22 11:21:31 -07:00
Geoff Mendal
0a167c400a
Import translations. DO NOT MERGE
...
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
2015-07-22 06:59:04 -07:00
Geoff Mendal
9c17fab30f
Import translations. DO NOT MERGE
...
Change-Id: I06e1210f46fc7a5e9e822b4bb4d11f7531c2c5eb
Auto-generated-cl: translation import
2015-07-22 06:11:39 -07:00
Maurice Lam
32b96646ee
Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
2015-07-21 23:40:02 +00:00
Maurice Lam
e44ceed122
Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
2015-07-21 23:38:34 +00:00
Billy Lau
2e407c317a
am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d
am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:36:48 +00:00
Billy Lau
f7011298ed
am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit 'bc3695c231a5a16f45059e0e561a35d49353afc5':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:21:45 +00:00
Billy Lau
bc3695c231
am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
...
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:06:42 +00:00
Billy Lau
bb3aa2632a
Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
...
Overall, fixed the detection of the state of permission in the corresponding
UX to be more accurate. Also ensured that apps needing this capability can
launch the summary UX through a specific intent.
AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.
strings.xml:
Increased the CHAR limits for some strings due to requests from translators.
Change-Id: Ie64f86e034867ed582c1c583a5e8f84671fa4d63
2015-07-21 17:44:49 +01:00
Daichi Hirono
35197218fc
Merge "Turn the eject menu into a button."
2015-07-21 06:14:37 +00:00
Maurice Lam
7e83103020
[ScreenLock] Style encryption interstitial in SUW
...
When running in setup wizard, style the encryption interstitial using
styles from Setup Wizard library, to be consistent with the rest of
the setup flow.
Bug: 22587892
Change-Id: I3787643139ec4189f16e0046875fe3a688c8060b
2015-07-20 21:06:21 -07:00
Maurice Lam
fed7de4546
am d0577460: am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'd05774600e5ac86cb883041abfb5b407afa04fd3':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:47:32 +00:00
Maurice Lam
a5d2be8683
am 6e512e08: am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit '6e512e0815c8678621077008498f18e73402ecc3':
[Fingerprint] Change message in encryption
2015-07-21 01:37:07 +00:00
Maurice Lam
9a93dfa8cb
am d7615bba: am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'd7615bbaacf6c7dc4ae91e0921cfb2f5987c73bc':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:37:06 +00:00
Maurice Lam
d05774600e
am 3234f0b9: am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit '3234f0b9bdbe32658d1ebe33e278cfb5185a785b':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:35:01 +00:00
Maurice Lam
3234f0b9bd
am c690d199: am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'c690d199be82337f3909348443391bbad081d37f':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:19:47 +00:00
Maurice Lam
6e512e0815
am b8c09951: am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit 'b8c099519bfc93777de19095c9aa6030ca51b6cc':
[Fingerprint] Change message in encryption
2015-07-21 01:18:51 +00:00
Maurice Lam
d7615bbaac
am ec2f7fe5: am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit 'ec2f7fe57d7a210f226ddcb622e01cf4c45b25b2':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:18:49 +00:00
Maurice Lam
b8c099519b
am e82793a2: am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit 'e82793a2de48be5334f3892d96e1e2736a3064c0':
[Fingerprint] Change message in encryption
2015-07-21 01:04:50 +00:00
Maurice Lam
ec2f7fe57d
am 135c8869: am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit '135c8869fe4cc2cad8df07172c2f225da23ef07e':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 01:04:49 +00:00
Maurice Lam
c690d199be
am d5af0d8b: am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
...
* commit 'd5af0d8b8a973a2f82024f5358572b609e47a758':
[ScreenLock] Change title of encryption interstitial
2015-07-21 01:04:47 +00:00
Maurice Lam
e82793a2de
am 6132fe1c: am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
...
* commit '6132fe1c02a944bf87604a4773e091124de4954d':
[Fingerprint] Change message in encryption
2015-07-21 00:49:50 +00:00
Maurice Lam
135c8869fe
am 8ebd1e2c: am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
...
* commit '8ebd1e2c06d8526dd8a3081d743bc77ee565fc10':
[ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:49:49 +00:00
Maurice Lam
d85fafce30
Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
2015-07-21 00:38:39 +00:00
