Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,933 Commits 1 Branch 0 Tags
f13f08be291ff5cfe52b6fc99112e533698af41a
Commit Graph

6897 Commits

Author SHA1 Message Date
Martijn Coenen
d93b641280 am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit '3c975a9fc15c39077613ce741e71fa2baf789492':
  Add contactless symbol to NFC resources.
 2015-07-29 13:55:08 +00:00
Martijn Coenen
3c975a9fc1 am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev 
* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
  Add contactless symbol to NFC resources.
 2015-07-29 13:34:38 +00:00
Martijn Coenen
edb2668c6d Merge "Add contactless symbol to NFC resources." into mnc-dev 2015-07-29 13:21:40 +00:00
Julia Reynolds
f2d5e02c4d am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit '39768c86af48e26717110814f2f208e64e854331':
  Bump string char limit.
 2015-07-29 13:00:24 +00:00
Julia Reynolds
39768c86af am f889faaf: Merge "Bump string char limit." into mnc-dev 
* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.
 2015-07-29 12:39:11 +00:00
Julia Reynolds
f889faaf08 Merge "Bump string char limit." into mnc-dev 2015-07-29 12:25:28 +00:00
Martijn Coenen
b0390ed0e5 am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
  Fix tap & pay strings.
 2015-07-29 10:06: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
de661d5b15 am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev 
* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.
 2015-07-29 08:10:14 +00:00
Martijn Coenen
8e7b9cf9f6 Merge "Fix tap & pay strings." into mnc-dev 2015-07-29 07:54:04 +00:00
Jorim Jaggi
831e3f665a am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev 
* commit '7abb5164987b812271ac3ba2541e95400834ec70':
  Make fingerprint error text a live region
 2015-07-28 20:30:43 +00:00
Jorim Jaggi
4d0b9669e8 am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev 
* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
  Adjust enrollment UI for sw400 devices
 2015-07-28 20:30:41 +00:00
Jorim Jaggi
7abb516498 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:01 +00:00
Jorim Jaggi
f6bdf5321f 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:00 +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
e0120a8e38 am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
  Adjust choose assist app string
 2015-07-28 01:06:24 +00: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
cc5c7809c5 am 730389bd: Merge "Adjust choose assist app string" into mnc-dev 
* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string
 2015-07-28 00:50:45 +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
d1c8a6127d am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev 
* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
  Autocapitalizing the fingerprint names now
 2015-07-27 21:25:12 +00:00
Selim Cinek
d54849ed15 am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev 
* commit 'ba88730130ab661ac0608821eed082589ba7d97f':
  Added content description for the fingerprint icon
 2015-07-27 21:25:09 +00:00
Selim Cinek
73f601d688 am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev 
* commit '01b2d8124b513643181c50c76b7cdc38c3b404ec':
  Adapted a string in the fingerprint enrollment flow
 2015-07-27 21:25:07 +00:00
Selim Cinek
34877c4077 am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev 
* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
  Autocapitalizing the fingerprint names now
 2015-07-27 21:11:31 +00:00
Selim Cinek
ba88730130 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:11:30 +00:00
Selim Cinek
01b2d8124b 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:11:28 +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
f0b615de01 am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
  Update battery optimization strings
 2015-07-27 18:19:09 +00:00
Jason Monk
b322fdf5b8 am 08cb3983: Merge "Update battery optimization strings" into mnc-dev 
* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
  Update battery optimization strings
 2015-07-27 18:06:02 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings 
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
 2015-07-27 12:29:25 -04:00
Geoff Mendal
aeae201ddc Import translations. DO NOT MERGE 
Change-Id: I8535a63ec3b802c8e4440831fb79bc34a7192a0d
Auto-generated-cl: translation import
 2015-07-27 06:53:25 -07:00
Adrian Roos
b87428a61d am 5ada0050: am 38c9b9eb: Update FRP warning to spec 
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec
 2015-07-25 15:54:26 +00:00
Adrian Roos
5ada0050b7 am 38c9b9eb: Update FRP warning to spec 
* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec
 2015-07-25 00:59:08 +00:00
Geoff Mendal
92ca0cbe8f Import translations. DO NOT MERGE 
Change-Id: Iee689b96e6d57b9968c5efb133425ca888099d46
Auto-generated-cl: translation import
 2015-07-24 17:09:25 -07: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
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
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
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