Commit Graph

20918 Commits

Author SHA1 Message Date
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
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
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
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
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
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
bcb0011dd9 am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
  Fix blank confirm device credential activity
2015-07-28 01:06:22 +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
afd5a84830 am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity
2015-07-28 00:50:44 +00:00
Jorim Jaggi
730389bd82 Merge "Adjust choose assist app string" into mnc-dev 2015-07-28 00:39:12 +00:00
Jorim Jaggi
dcf61a2dfa Merge "Fix blank confirm device credential activity" into mnc-dev 2015-07-28 00:36:00 +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
Jorim Jaggi
33f430ea90 am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '935b4444160ca816a769faf509a2d6789e5e6651':
  Move PIN/Pattern appear animation to RenderThread (2/2)
2015-07-27 19:30:29 +00:00
Jorim Jaggi
935b444416 am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit '58d1995c904f12dfb00185af3dabfe267d50568a':
  Move PIN/Pattern appear animation to RenderThread (2/2)
2015-07-27 19:18:34 +00:00
Jason Monk
436a8bbeb0 am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
  Battery summary - tint uid 0 icon
2015-07-27 19:04:10 +00:00
Jorim Jaggi
58d1995c90 Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev 2015-07-27 18:55:30 +00:00
Jorim Jaggi
35d26096c0 Fix blank confirm device credential activity
Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.

Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d
2015-07-27 18:53:29 +00:00
Jason Monk
3eb14e0383 am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
  Battery summary - tint uid 0 icon
2015-07-27 18:51:45 +00:00
Jason Monk
3b521b60d3 Merge "Battery summary - tint uid 0 icon" into mnc-dev 2015-07-27 18:36:10 +00:00