Commit Graph

7224 Commits

Author SHA1 Message Date
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
274d92467a am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.
2015-07-29 08:12:07 +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
aa587b39b6 Adjustments for find sensor screen
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
2015-07-28 23:58:56 +00:00
Jorim Jaggi
9fd7d6fd63 am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region
2015-07-28 20:08:46 +00:00
Jorim Jaggi
4088cef80f am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices
2015-07-28 20:08:44 +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
69941efa8b am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string
2015-07-28 00:49:25 +00: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
d2b6e1acd0 am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
  Autocapitalizing the fingerprint names now
2015-07-27 21:12:05 +00:00
Selim Cinek
412eb5dfde am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
  Added content description for the fingerprint icon
2015-07-27 21:12:04 +00:00
Selim Cinek
e0f552c140 am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '95ddf903495f97f6d008f8723887228015ed7ead':
  Adapted a string in the fingerprint enrollment flow
2015-07-27 21:12:03 +00: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
9d5907d03e am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
  Update battery optimization strings
2015-07-27 17: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
d6dc0bb46a am 38c9b9eb: Update FRP warning to spec
* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec
2015-07-24 22:37:48 +00: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
e2840f1ce3 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
2015-07-23 18:27:32 +00:00
Maurice Lam
2f2779acce am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:17:37 +00:00
Maurice Lam
899d0a2894 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
2015-07-22 20:17:33 +00: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
3d861fd129 am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'd06ba151f5cc966bf05b2ac0146602d31ae81c4a':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 17:54:01 +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
c97e5aba84 am d85fafce: Merge "[ScreenLock] Change title of encryption interstitial" into mnc-dev
* commit 'd85fafce30f6fb71ea9de9de3c6d8aafc99dba33':
  [ScreenLock] Change title of encryption interstitial
2015-07-21 00:50:32 +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
a33b68af3e am d10026cb: Merge "[Fingerprint] Change message in encryption" into mnc-dev
* commit 'd10026cbfde671448b702fde345da52ac7569d04':
  [Fingerprint] Change message in encryption
2015-07-21 00:33:14 +00:00
Maurice Lam
ac4b7fac6b am af57ec88: Merge "[ScreenLock] Change title for RedactionInterstitial" into mnc-dev
* commit 'af57ec8831d3047400a6bcbc8c5e73fc3888b7d3':
  [ScreenLock] Change title for RedactionInterstitial
2015-07-21 00:33:13 +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