Commit Graph

7721 Commits

Author SHA1 Message Date
Jorim Jaggi
222aeaf301 am 18dea40e: am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '18dea40e2d755fbec2f028682c2754be4999183a':
  Adjustments for find sensor screen
2015-07-29 22:56:34 +00:00
Jorim Jaggi
18dea40e2d am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '1b730cb77eb44e9e6938e11fe19522dcd909ec2f':
  Adjustments for find sensor screen
2015-07-29 22:39:34 +00:00
Geoff Mendal
53f771d821 Import translations. DO NOT MERGE
Change-Id: I959a8c52fd330769880fd9b41894e404865a951e
Auto-generated-cl: translation import
2015-07-29 15:31:28 -07:00
Jorim Jaggi
1b730cb77e am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '434d55e591bfb7cc84fed8d8574624425348a711':
  Adjustments for find sensor screen
2015-07-29 22:26:16 +00:00
Jorim Jaggi
434d55e591 am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
  Adjustments for find sensor screen
2015-07-29 22:14:09 +00:00
Julia Reynolds
7b37a563ce am 89594f52: am 61bc6b72: am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '89594f520ad0b59dd58ea67cd788d6ee63485fdb':
  Change assist app warning message text
2015-07-29 22:02:33 +00:00
Julia Reynolds
878aca754b am 7ae0f3cd: am a578d3af: am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '7ae0f3cdf21811712527461d623c5699b96cf8a2':
  Change 'data' label to 'data usage'.
2015-07-29 22:02:31 +00:00
Jorim Jaggi
23ace01340 Merge "Adjustments for find sensor screen" into mnc-dev 2015-07-29 21:58:43 +00:00
Julia Reynolds
89594f520a am 61bc6b72: am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '61bc6b729b61359c89ed695910fb1774eab9e88a':
  Change assist app warning message text
2015-07-29 18:52:51 +00:00
Julia Reynolds
7ae0f3cdf2 am a578d3af: am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit 'a578d3afe839247c24ee805852d7fdf12250607c':
  Change 'data' label to 'data usage'.
2015-07-29 18:52:49 +00:00
Julia Reynolds
61bc6b729b am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
  Change assist app warning message text
2015-07-29 18:30:46 +00:00
Julia Reynolds
a578d3afe8 am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
  Change 'data' label to 'data usage'.
2015-07-29 18:30:45 +00:00
Julia Reynolds
24a1ac3620 am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
  Change assist app warning message text
2015-07-29 18:03:57 +00:00
Julia Reynolds
6785be7362 am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
  Change 'data' label to 'data usage'.
2015-07-29 18:03:56 +00:00
Julia Reynolds
c2f62f650a am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
  Change assist app warning message text
2015-07-29 17:41:15 +00:00
Julia Reynolds
089e9e9a0d am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
  Change 'data' label to 'data usage'.
2015-07-29 17:41:14 +00:00
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
0bfb940964 am 7d49ed8a: am 034b6801: am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '7d49ed8ac25426dcdeb7a022bab421ba3152d430':
  Add contactless symbol to NFC resources.
2015-07-29 14:57:59 +00:00
Martijn Coenen
7d49ed8ac2 am 034b6801: am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '034b6801f4a42522c2493d3f3df2c7596c183de6':
  Add contactless symbol to NFC resources.
2015-07-29 14:36:49 +00:00
Martijn Coenen
034b6801f4 am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit 'd93b6412801706311b9389f789ecdf76969695db':
  Add contactless symbol to NFC resources.
2015-07-29 14:16:35 +00:00
Geoff Mendal
fe6fc96a59 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-29 13:59:28 +00:00
Geoff Mendal
a497606a49 Import translations. DO NOT MERGE
Change-Id: Ic5113dd5d45744811ac6ca45f037333b7f659362
Auto-generated-cl: translation import
2015-07-29 06:56:59 -07:00
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
Julia Reynolds
77f4d053d6 am 9062cdba: am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '9062cdba945cbb493df54b5a7ab61a514283d0e0':
  Bump string char limit.
2015-07-29 13:55:08 +00:00
Julia Reynolds
9062cdba94 am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '826400bdbb47e2818b35ab2d77b948317e127719':
  Bump string char limit.
2015-07-29 13:34:42 +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
826400bdbb am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit 'f2d5e02c4d9334545247e437712f4407e97f84ca':
  Bump string char limit.
2015-07-29 13:20:33 +00:00
Geoff Mendal
0abb9b7d69 Import translations. DO NOT MERGE
Change-Id: Ief396718afca7ea286c8ad923eb1448074fd2d4d
Auto-generated-cl: translation import
2015-07-29 06:05:53 -07: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
f299787f32 am 25f86b0f: am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
  Fix tap & pay strings.
2015-07-29 11:04:34 +00:00
Martijn Coenen
25f86b0faf am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '120ed352430ae322fa9a5cc79f2c7bf654e2156a':
  Fix tap & pay strings.
2015-07-29 10:46:42 +00:00
Martijn Coenen
120ed35243 am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit 'b0390ed0e57af73a2ee6a692598fe8dd28748d72':
  Fix tap & pay strings.
2015-07-29 10:27:36 +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
aa587b39b6 Adjustments for find sensor screen
Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170
2015-07-28 23:58:56 +00:00
Jorim Jaggi
d14ffb55c6 am 6922122e: am a67487ee: am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '6922122eb549bdda5382fbcd709cad6be0d012f7':
  Make fingerprint error text a live region
2015-07-28 21:38:19 +00:00
Jorim Jaggi
0378c2e55d am 91f4d549: am f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '91f4d5490d0f9aa86015c565250b2f8d9e2d608b':
  Adjust enrollment UI for sw400 devices
2015-07-28 21:38:17 +00:00
Jorim Jaggi
6922122eb5 am a67487ee: am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit 'a67487eed2a5fe8047a3bc8ace53660793c244ff':
  Make fingerprint error text a live region
2015-07-28 21:18:47 +00:00
Jorim Jaggi
91f4d5490d am f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit 'f97f74169362e301c4676d41ac89d5f3330f0651':
  Adjust enrollment UI for sw400 devices
2015-07-28 21:18:46 +00:00
Jorim Jaggi
a67487eed2 am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '831e3f665a1f2ea1fa95f6c3a3380713ce9c00b1':
  Make fingerprint error text a live region
2015-07-28 20:54:38 +00:00
Jorim Jaggi
f97f741693 am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '4d0b9669e8d5813fa61f7515ae3cfc7aca13851b':
  Adjust enrollment UI for sw400 devices
2015-07-28 20:54:36 +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