Commit Graph

6833 Commits

Author SHA1 Message Date
Julia Reynolds
00b5488c67 Merge "Change assist app warning message text" into mnc-dev 2015-07-29 17:26:12 +00:00
Julia Reynolds
ae422fd099 Merge "Change 'data' label to 'data usage'." into mnc-dev 2015-07-29 17:25:41 +00:00
Julia Reynolds
ff0e1650d9 Change 'data' label to 'data usage'.
Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c
2015-07-29 13:15:14 -04:00
Julia Reynolds
5bdf80c868 Change assist app warning message text
Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555
2015-07-29 13:02:09 -04:00
Martijn Coenen
edb2668c6d Merge "Add contactless symbol to NFC resources." into mnc-dev 2015-07-29 13:21:40 +00:00
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
927369befd Add contactless symbol to NFC resources.
Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431
2015-07-29 10:10:35 +02:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Jorim Jaggi
5458688c1a Merge "Make fingerprint error text a live region" into mnc-dev 2015-07-28 19:51:03 +00:00
Jorim Jaggi
74af384cae Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 2015-07-28 19:50:47 +00:00
Julia Reynolds
5dadca81eb Bump string char limit.
Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837
2015-07-28 13:39:24 -04:00
Martijn Coenen
b637ba08ad Fix tap & pay strings.
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
2015-07-28 16:37:39 +02:00
Jorim Jaggi
ba435f0ce0 Make fingerprint error text a live region
Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d
2015-07-27 18:00:04 -07:00
Jorim Jaggi
730389bd82 Merge "Adjust choose assist app string" into mnc-dev 2015-07-28 00:39:12 +00:00
Jorim Jaggi
9b456e5f9d Adjust enrollment UI for sw400 devices
Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b
2015-07-27 17:31:58 -07:00
Jorim Jaggi
66664bea91 Adjust choose assist app string
Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f
2015-07-27 14:53:48 -07:00
Selim Cinek
596ce9bab7 Merge "Autocapitalizing the fingerprint names now" into mnc-dev 2015-07-27 20:58:01 +00:00
Selim Cinek
a8c7c8c891 Merge "Added content description for the fingerprint icon" into mnc-dev 2015-07-27 20:57:45 +00:00
Selim Cinek
95ddf90349 Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 2015-07-27 20:57:23 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
2015-07-27 12:29:25 -04:00
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
Geoff Mendal
5376d54e8e Import translations. DO NOT MERGE
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
2015-07-23 18:10: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
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00: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
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
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
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
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
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
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
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
b852fcbde9 Merge "Offer 'ask' as an available app-linking state" into mnc-dev 2015-07-20 17:06:27 +00: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
0c03b50a02 Merge "Remove blank switchtext from switch preferences." into mnc-dev 2015-07-17 20:11:27 +00:00
Billy Lau
f8f9802104 Bug 21589105 Rescope SYSTEM_ALERT_WINDOW (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 can actually launch the summary UX
through a custom intent.

AndroidManifest:
Adds the proper intent-filter so that apps can launch the Settings page using
intent.

strings:
Made changes to strings so that wordings are uniform everywhere and raised the
char limit due to requests from translators.

Change-Id: Ia03403641ad53bd1a33b84dae6db1739cfcf9d60
2015-07-17 18:23:57 +01:00
Makoto Onuki
26cf58aba6 Fix ugly text wrapping on non-english locales
Bug 22284618

Change-Id: Iaab017fa5d2f5aeb3457f911cbd31ceb8671e495
2015-07-16 15:45:09 -07:00
Jason Monk
b1d9536e58 Remove tuner from development settings
It has a new home now.

Bug: 22462605
Change-Id: Ibf07a63db14579d07b09d5150b7d04cf138f3b78
2015-07-16 16:41:15 -04:00
Julia Reynolds
16eec50576 Remove blank switchtext from switch preferences.
This makes TTS services read the default text (on/off) when
these switches are toggled.

Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
2015-07-16 13:28:16 -04:00
Sanket Padawe
046decca29 Merge "Use common xml file for multi-tab settings." into mnc-dev 2015-07-16 05:01:27 +00:00