Commit Graph

22502 Commits

Author SHA1 Message Date
Geoff Mendal
0abb9b7d69 Import translations. DO NOT MERGE
Change-Id: Ief396718afca7ea286c8ad923eb1448074fd2d4d
Auto-generated-cl: translation import
2015-07-29 06:05:53 -07: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
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
Zach Johnson
9153a338b7 am b9739da6: am 0f5373e0: am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit 'b9739da6d0929d41a6490e99dbeb7abfc1ddaf43':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-29 00:17:17 +00:00
Zach Johnson
b9739da6d0 am 0f5373e0: am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '0f5373e0eb2a912407323aaa459a3c55d3037115':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:56:29 +00:00
Zach Johnson
0f5373e0eb am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit 'b5c146eef9dcbc405530ef1855d192ec59119100':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:33:58 +00:00
Zach Johnson
b5c146eef9 am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit 'ecb19d540025a6c1855d148f1b4015f3a107bfd1':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 23:18:57 +00:00
Zach Johnson
ecb19d5400 am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit 'a425e86478b60c4eb1f90f47197fa244379879de':
  Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
2015-07-28 22:57:58 +00:00
Zach Johnson
a425e86478 Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev 2015-07-28 22:36:31 +00:00
Julia Reynolds
5f4278bdd9 am b5852c60: am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit 'b5852c60610014b31a52792762ef120a68468775':
  Prevent crash in app memory updater.
2015-07-28 22:05:06 +00:00
Julia Reynolds
639ff84f94 am 3275d302: am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '3275d30212196f8d42afb6d455508e345bf544e5':
  Hide usage graph on app usage details pages.
2015-07-28 22:05:03 +00:00
Julia Reynolds
b5852c6061 am 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '981ff1825e74dd391f4b7cdf03032cfbab0d7100':
  Prevent crash in app memory updater.
2015-07-28 21:53:01 +00:00
Julia Reynolds
3275d30212 am 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '13a070549d7a38e6b892293eb1ec4f6e52eff2cc':
  Hide usage graph on app usage details pages.
2015-07-28 21:53:00 +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
370af761fc am 6c4a29e5: am 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '6c4a29e5e8c736d53506ef6a84dede2d64ebe3a5':
  Don't use screenshot if structure is disabled (2/2)
2015-07-28 21:38:16 +00:00
Julia Reynolds
981ff1825e am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '8bdb556174bfb8a903040a5310e3d48f2c4be5bf':
  Prevent crash in app memory updater.
2015-07-28 21:37:27 +00:00
Julia Reynolds
13a070549d am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '2ade0a5e7bb52438732555f860f924c0eeacd3c2':
  Hide usage graph on app usage details pages.
2015-07-28 21:37:26 +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
6c4a29e5e8 am 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '72f141a518426b53295f65836eebb7ecf4316c2d':
  Don't use screenshot if structure is disabled (2/2)
2015-07-28 21:18:45 +00:00
Julia Reynolds
8bdb556174 am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
  Prevent crash in app memory updater.
2015-07-28 21:16:06 +00:00
Julia Reynolds
2ade0a5e7b am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit 'b7c6306b8322de90e5a620ac5e670216685c7841':
  Hide usage graph on app usage details pages.
2015-07-28 21:16:03 +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
72f141a518 am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit 'a15cf2279619a35d1cfe868fb116d90ed0c4a0c8':
  Don't use screenshot if structure is disabled (2/2)
2015-07-28 20:54:35 +00:00
Julia Reynolds
85bdb77308 am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.
2015-07-28 20:54:07 +00:00
Julia Reynolds
b7c6306b83 am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.
2015-07-28 20:54:06 +00:00
Julia Reynolds
5b5ed310d4 Merge "Prevent crash in app memory updater." into mnc-dev 2015-07-28 20:32:08 +00:00
Julia Reynolds
feeae4cdeb Merge "Hide usage graph on app usage details pages." into mnc-dev 2015-07-28 20:32:05 +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
a15cf22796 am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '22064d8b89dbe4feb79acff3606540f416bd00a0':
  Don't use screenshot if structure is disabled (2/2)
2015-07-28 20:30:40 +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
22064d8b89 am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '4d9f5c91aeb7ab1ab9828bce45d5f0a7c3ba0716':
  Don't use screenshot if structure is disabled (2/2)
2015-07-28 20:07:58 +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
Jorim Jaggi
4d9f5c91ae Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev 2015-07-28 19:49:43 +00:00
Julia Reynolds
ed91bbdb1f Prevent crash in app memory updater.
Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d
2015-07-28 15:49:39 -04:00
Jorim Jaggi
e32c17580e Don't use screenshot if structure is disabled (2/2)
Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034
2015-07-28 12:07:10 -07:00
Jorim Jaggi
c19d2be9de am 2f975b53: am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '2f975b534dd1acd3a2e5414a36e2e25af1586c07':
  Adjust choose assist app string
2015-07-28 18:47:21 +00:00
Jorim Jaggi
d3e3c0d697 am e02213db: am 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'e02213db6befe76463ad0031283a3dfd5a8aa0ad':
  Fix blank confirm device credential activity
2015-07-28 18:47:17 +00:00
Xiaohui Chen
e43640b376 Merge "sys user split: first pass updating Settings" 2015-07-28 17:39:59 +00:00
Martijn Coenen
b637ba08ad Fix tap & pay strings.
Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7
2015-07-28 16:37:39 +02:00
Julia Reynolds
1740ce4f0c Hide usage graph on app usage details pages.
Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560
2015-07-28 10:03:13 -04:00