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
Maurice Lam
d10026cbfd
Merge "[Fingerprint] Change message in encryption" into mnc-dev
2015-07-21 00:25:16 +00:00
Maurice Lam
af57ec8831
Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
2015-07-21 00:22:03 +00:00
Makoto Onuki
b2121d9bdd
am 0968056b: am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit '0968056bac9c4eb808792eb6ae0b387899924b89':
Fix ugly text wrapping on non-english locales
2015-07-21 00:14:03 +00:00
Jason Monk
c2f431debe
am 97c68c18: am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
...
* commit '97c68c181dba345139e6ae98cdc4128b1744e1a0':
Handle monkey crash
2015-07-21 00:14:01 +00:00
Maurice Lam
5cceb312fd
[ScreenLock] Change title for RedactionInterstitial
...
Change the title for RedactionInterstital to "Notifications".
Bug: 22587892
Change-Id: Ib0e32fa8913924ae74aa412703a5f6234fd62fe4
2015-07-20 23:42:52 +00:00
Maurice Lam
5304965bc8
[ScreenLock] Update illustration during setup wizard
...
Update the illustration to a new version which changes the "screen"
illustrated in the device.
Bug: 22587892
Change-Id: Ic52e28eb40b965b49fa4f2f220284cd2768470d5
2015-07-20 16:40:51 -07:00
Geoff Mendal
1992d5a1fc
Import translations. DO NOT MERGE
...
Change-Id: I1a4e18120641388458b5f90a531978292f307bc6
Auto-generated-cl: translation import
2015-07-20 15:33:59 -07:00
Geoff Mendal
c9541e5fda
Import translations. DO NOT MERGE
...
Change-Id: Iee81fc4d17f748e4a9fd294c6d813a773dc44b89
Auto-generated-cl: translation import
2015-07-20 15:26:26 -07:00
Maurice Lam
15546c0b9d
[ScreenLock] Change title of encryption interstitial
...
Change the title of EncryptionInterstitial to "Secure start-up".
Bug: 22587892
Change-Id: I30b9625bb2da666cd5e229445ad369fe72faad51
2015-07-20 15:23:41 -07:00
Maurice Lam
c0e7879684
[Fingerprint] Change message in encryption
...
Change the message for encryption interstitial when enrollin
fingerprint, to make it clear that fingerprint unlock is still used,
just that the backup unlock PIN / password / pattern will be needed
to start the device.
Bug: 22559146
Change-Id: Ia134e0d9b118151833a9118ff44667dcc9122185
2015-07-20 21:52:12 +00:00
Makoto Onuki
0968056bac
am f5ac0b6a: am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit 'f5ac0b6a10b61287789dee0a7a05bf9e6a90a7b6':
Fix ugly text wrapping on non-english locales
2015-07-20 21:38:08 +00:00
Jason Monk
97c68c181d
am 8e350e80: am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
...
* commit '8e350e80343dbfd8aafce275a25fff7124f3e9ce':
Handle monkey crash
2015-07-20 21:38:07 +00:00
Makoto Onuki
f5ac0b6a10
am f9b46965: am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit 'f9b46965b7c3e2fb7985669f3a2b1bdeed06a2c3':
Fix ugly text wrapping on non-english locales
2015-07-20 21:23:38 +00:00
Jason Monk
8e350e8034
am b48e56c9: am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
...
* commit 'b48e56c9b232710c2de0fa852d7230e9b0a191d7':
Handle monkey crash
2015-07-20 21:23:37 +00:00
Makoto Onuki
f9b46965b7
am 75842ffc: am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit '75842ffc9a8a41425b69e1e1ad77ffde14ed4749':
Fix ugly text wrapping on non-english locales
2015-07-20 21:08:05 +00:00
Jason Monk
b48e56c9b2
am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev
...
* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
Handle monkey crash
2015-07-20 21:08:04 +00:00
Makoto Onuki
75842ffc9a
am 4dd637a0: Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
...
* commit '4dd637a07e7eba9341d85c21fbb1fccac7e685c3':
Fix ugly text wrapping on non-english locales
2015-07-20 20:46:02 +00:00
Jason Monk
959a7380f1
am 178c4099: Merge "Handle monkey crash" into mnc-dev
...
* commit '178c40998df2d5196bc5913fca831880cfa47c50':
Handle monkey crash
2015-07-20 20:46:01 +00:00
Makoto Onuki
4dd637a07e
Merge "Fix ugly text wrapping on non-english locales" into mnc-dev
2015-07-20 20:35:09 +00:00
Jason Monk
178c40998d
Merge "Handle monkey crash" into mnc-dev
2015-07-20 20:32:29 +00:00
Christopher Tate
d2dcd30acd
am 99e89859: am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '99e8985959682c510e7e2fac210768e2471b4b26':
Offer 'ask' as an available app-linking state
2015-07-20 18:38:23 +00:00
Christopher Tate
99e8985959
am ef1961c7: am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'ef1961c7326aa60e1e3bbb738394c535b7f952af':
Offer 'ask' as an available app-linking state
2015-07-20 18:17:05 +00:00
Christopher Tate
ef1961c732
am 7cce6d0c: am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit '7cce6d0c529bf9d3820b1fc4d8b5ad364a74a478':
Offer 'ask' as an available app-linking state
2015-07-20 17:59:35 +00:00
Christopher Tate
7cce6d0c52
am f330857a: am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'f330857a17d29cec33ca0169cb30fdc69854ab52':
Offer 'ask' as an available app-linking state
2015-07-20 17:41:08 +00:00
Jason Monk
bd45c3cbe0
Handle monkey crash
...
Don't create dialog if we don't have one to create, and make sure
that storage-related prefs are removed when they aren't needed.
Bug: 22571238
Change-Id: I452cbf75313cd14572fc7b57bd6164292cf17209
2015-07-20 13:40:40 -04:00
Christopher Tate
f330857a17
am b852fcbd: Merge "Offer \'ask\' as an available app-linking state" into mnc-dev
...
* commit 'b852fcbde9f5e0d92f5fc2ac8fc088eb114e3b63':
Offer 'ask' as an available app-linking state
2015-07-20 17:24:02 +00:00
Christopher Tate
b852fcbde9
Merge "Offer 'ask' as an available app-linking state" into mnc-dev
2015-07-20 17:06:27 +00:00
Geoff Mendal
9c314f05f8
Import translations. DO NOT MERGE
...
Change-Id: Ibd37f1c6a32c600eaf7b410891ba81814589ea04
Auto-generated-cl: translation import
2015-07-20 07:01:44 -07:00
Geoff Mendal
ca354d3f5f
Import translations. DO NOT MERGE
...
Change-Id: I26e34043644e1fcf86201a20019bba85f500e3fe
Auto-generated-cl: translation import
2015-07-20 06:14:39 -07:00
Christopher Tate
2eda36509f
Offer 'ask' as an available app-linking state
...
Bug 22532193
Change-Id: I5bb43b1b8d84af1901f99fb10dd899c260d94c99
2015-07-17 16:11:41 -07:00
Julia Reynolds
7c5f0e18cc
am 406b1b9f: am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '406b1b9f204e769181901a2c157b026971e902fb':
Remove blank switchtext from switch preferences.
2015-07-17 21:21:48 +00:00
Julia Reynolds
406b1b9f20
am 98f81284: am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '98f8128486d44defdd6cbda3346baceb6dc1c5f1':
Remove blank switchtext from switch preferences.
2015-07-17 21:07:35 +00:00
Julia Reynolds
98f8128486
am 03b1b4f3: am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '03b1b4f33f9101d95f0e881ffebec24a99498eb0':
Remove blank switchtext from switch preferences.
2015-07-17 20:53:54 +00:00
Julia Reynolds
03b1b4f33f
am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev
...
* commit '8560ae2f8752f611ffee651289519a7993b3e500':
Remove blank switchtext from switch preferences.
2015-07-17 20:40:19 +00:00
Julia Reynolds
0c03b50a02
Merge "Remove blank switchtext from switch preferences." into mnc-dev
2015-07-17 20:11:27 +00:00
Billy Lau
6897d6978e
am 81e050aa: am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit '81e050aad01c15484fe4e262c53475bd13c4782b':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:52:38 +00:00
Billy Lau
81e050aad0
am 28f35248: am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit '28f352483e2951339627be1867562cd4ca99f66e':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:29:21 +00:00
Billy Lau
28f352483e
am e5a95396: am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit 'e5a95396da082a3ba432c5d8ed5a7baa2eacd55c':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 19:09:06 +00:00
Billy Lau
e5a95396da
am e104fced: am 90a8a01b: Merge "Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)..." into mnc-dev
...
* commit 'e104fced18056905286ee01a3ef8c3d12f2b9e4d':
Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (UX and Settings app change)...
2015-07-17 18:57:51 +00:00
