OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 3d6a40af: am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility...
Julia Reynolds [Wed, 29 Jul 2015 13:34:43 +0000 (13:34 +0000)]
am 3d6a40af: am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '3d6a40af6e8adb8230812a84998fadf82d71048f':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit...
Julia Reynolds [Wed, 29 Jul 2015 13:34:42 +0000 (13:34 +0000)]
am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit '826400bdbb47e2818b35ab2d77b948317e127719':
  Bump string char limit.

9 years agoam 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confi...
Julia Reynolds [Wed, 29 Jul 2015 13:20:37 +0000 (13:20 +0000)]
am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '1990f8f722a050e8eccbf9755c5a6d7e1487132f':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 13:20:33 +0000 (13:20 +0000)]
am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit 'f2d5e02c4d9334545247e437712f4407e97f84ca':
  Bump string char limit.

9 years agoam cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern...
Julia Reynolds [Wed, 29 Jul 2015 13:00:27 +0000 (13:00 +0000)]
am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit 'cb91edaeb2fd9bdf8a77a994c4767fac808bbe36':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 13:00:24 +0000 (13:00 +0000)]
am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit '39768c86af48e26717110814f2f208e64e854331':
  Bump string char limit.

9 years agoam 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into...
Julia Reynolds [Wed, 29 Jul 2015 12:39:12 +0000 (12:39 +0000)]
am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

* commit '300d6fd90c3b63948d86e140353604baa8339a34':
  Use pattern visibility setting on confirm pattern screen.

9 years agoam f889faaf: Merge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:39:11 +0000 (12:39 +0000)]
am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit 'f889faaf0829f011225882b160aa61158a7f69c2':
  Bump string char limit.

9 years agoMerge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:54 +0000 (12:25 +0000)]
Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

9 years agoMerge "Bump string char limit." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]
Merge "Bump string char limit." into mnc-dev

9 years agoam 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings...
Martijn Coenen [Wed, 29 Jul 2015 10:46:42 +0000 (10:46 +0000)]
am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit '120ed352430ae322fa9a5cc79f2c7bf654e2156a':
  Fix tap & pay strings.

9 years agoam b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 10:27:36 +0000 (10:27 +0000)]
am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit 'b0390ed0e57af73a2ee6a692598fe8dd28748d72':
  Fix tap & pay strings.

9 years agoam de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 10:06:07 +0000 (10:06 +0000)]
am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit 'de661d5b15e6d645229be4ea582a7d01fe160b9c':
  Fix tap & pay strings.

9 years agoam 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 08:10:14 +0000 (08:10 +0000)]
am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit '8e7b9cf9f67344192de98c951c11f144d1cdcd13':
  Fix tap & pay strings.

9 years agoMerge "Fix tap & pay strings." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]
Merge "Fix tap & pay strings." into mnc-dev

9 years agoam 0f5373e0: am b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery...
Zach Johnson [Tue, 28 Jul 2015 23:56:29 +0000 (23:56 +0000)]
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

9 years agoam b5c146ee: am ecb19d54: am a425e864: Merge "Hide apps in the battery menu that...
Zach Johnson [Tue, 28 Jul 2015 23:33:58 +0000 (23:33 +0000)]
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

9 years agoam ecb19d54: am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_EN...
Zach Johnson [Tue, 28 Jul 2015 23:18:57 +0000 (23:18 +0000)]
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

9 years agoam a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_D...
Zach Johnson [Tue, 28 Jul 2015 22:57:58 +0000 (22:57 +0000)]
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

9 years agoMerge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL...
Zach Johnson [Tue, 28 Jul 2015 22:36:31 +0000 (22:36 +0000)]
Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev

9 years agoam 981ff182: am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memor...
Julia Reynolds [Tue, 28 Jul 2015 21:53:01 +0000 (21:53 +0000)]
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.

9 years agoam 13a07054: am 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app...
Julia Reynolds [Tue, 28 Jul 2015 21:53:00 +0000 (21:53 +0000)]
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.

9 years agoam 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater...
Julia Reynolds [Tue, 28 Jul 2015 21:37:27 +0000 (21:37 +0000)]
am 8bdb5561: am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '8bdb556174bfb8a903040a5310e3d48f2c4be5bf':
  Prevent crash in app memory updater.

9 years agoam 2ade0a5e: am b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details...
Julia Reynolds [Tue, 28 Jul 2015 21:37:26 +0000 (21:37 +0000)]
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.

9 years agoam a67487ee: am 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error...
Jorim Jaggi [Tue, 28 Jul 2015 21:18:47 +0000 (21:18 +0000)]
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

9 years agoam f97f7416: am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for...
Jorim Jaggi [Tue, 28 Jul 2015 21:18:46 +0000 (21:18 +0000)]
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

9 years agoam 72f141a5: am a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot...
Jorim Jaggi [Tue, 28 Jul 2015 21:18:45 +0000 (21:18 +0000)]
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)

9 years agoam 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 21:16:06 +0000 (21:16 +0000)]
am 85bdb773: am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '85bdb7730814c1f1d8d13dec40e203e94fa87215':
  Prevent crash in app memory updater.

9 years agoam b7c6306b: am feeae4cd: Merge "Hide usage graph on app usage details pages." into...
Julia Reynolds [Tue, 28 Jul 2015 21:16:03 +0000 (21:16 +0000)]
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.

9 years agoam 831e3f66: am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:38 +0000 (20:54 +0000)]
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

9 years agoam 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:36 +0000 (20:54 +0000)]
am 4d0b9669: am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '4d0b9669e8d5813fa61f7515ae3cfc7aca13851b':
  Adjust enrollment UI for sw400 devices

9 years agoam a15cf227: am 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure...
Jorim Jaggi [Tue, 28 Jul 2015 20:54:35 +0000 (20:54 +0000)]
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)

9 years agoam 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:07 +0000 (20:54 +0000)]
am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev

* commit '5b5ed310d4eaf5f1c74594ada81a148d4f67f4c0':
  Prevent crash in app memory updater.

9 years agoam feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:54:06 +0000 (20:54 +0000)]
am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev

* commit 'feeae4cdebfa1303581dbd284039bcf91068addd':
  Hide usage graph on app usage details pages.

9 years agoMerge "Prevent crash in app memory updater." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]
Merge "Prevent crash in app memory updater." into mnc-dev

9 years agoMerge "Hide usage graph on app usage details pages." into mnc-dev
Julia Reynolds [Tue, 28 Jul 2015 20:32:05 +0000 (20:32 +0000)]
Merge "Hide usage graph on app usage details pages." into mnc-dev

9 years agoam 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into...
Jorim Jaggi [Tue, 28 Jul 2015 20:30:43 +0000 (20:30 +0000)]
am 7abb5164: am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '7abb5164987b812271ac3ba2541e95400834ec70':
  Make fingerprint error text a live region

9 years agoam f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:30:41 +0000 (20:30 +0000)]
am f6bdf532: am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit 'f6bdf5321f7102926da558a50e1ced6897192fd3':
  Adjust enrollment UI for sw400 devices

9 years agoam 22064d8b: am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled ...
Jorim Jaggi [Tue, 28 Jul 2015 20:30:40 +0000 (20:30 +0000)]
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)

9 years agoam 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:01 +0000 (20:08 +0000)]
am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev

* commit '5458688c1a951142b9a0b7f74c4b57e5909a857d':
  Make fingerprint error text a live region

9 years agoam 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:08:00 +0000 (20:08 +0000)]
am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

* commit '74af384cae9ea03f900c6f3aed2581477dedf68a':
  Adjust enrollment UI for sw400 devices

9 years agoam 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 20:07:58 +0000 (20:07 +0000)]
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)

9 years agoMerge "Make fingerprint error text a live region" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]
Merge "Make fingerprint error text a live region" into mnc-dev

9 years agoMerge "Adjust enrollment UI for sw400 devices" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]
Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

9 years agoMerge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 19:49:43 +0000 (19:49 +0000)]
Merge "Don't use screenshot if structure is disabled (2/2)" into mnc-dev

9 years agoPrevent crash in app memory updater.
Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]
Prevent crash in app memory updater.

Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d

9 years agoDon't use screenshot if structure is disabled (2/2)
Jorim Jaggi [Tue, 28 Jul 2015 00:48:02 +0000 (17:48 -0700)]
Don't use screenshot if structure is disabled (2/2)

Bug: 22674955
Change-Id: I78208a4c746e3a501fe264918607ef94f64a8034

9 years agoBump string char limit.
Julia Reynolds [Tue, 28 Jul 2015 17:39:24 +0000 (13:39 -0400)]
Bump string char limit.

Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837

9 years agoFix tap & pay strings.
Martijn Coenen [Mon, 27 Jul 2015 14:09:56 +0000 (16:09 +0200)]
Fix tap & pay strings.

Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7

9 years agoUse pattern visibility setting on confirm pattern screen.
Julia Reynolds [Tue, 28 Jul 2015 13:44:59 +0000 (09:44 -0400)]
Use pattern visibility setting on confirm pattern screen.

Bug: 22683055
Change-Id: Icc4c0c20175e09a0079f7a6bab93d3de6862f1a3

9 years agoHide usage graph on app usage details pages.
Julia Reynolds [Mon, 27 Jul 2015 20:00:06 +0000 (16:00 -0400)]
Hide usage graph on app usage details pages.

Also make the back button work properly on these pages.
Bug: 22691655

Change-Id: Icb4d7730cfe5a89ffada0489a69e646cddff5560

9 years agoam 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app...
Jorim Jaggi [Tue, 28 Jul 2015 01:33:32 +0000 (01:33 +0000)]
am 1e652aa0: am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '1e652aa0d814c13596bf414bd08b13f84f3abee7':
  Adjust choose assist app string

9 years agoam 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device...
Jorim Jaggi [Tue, 28 Jul 2015 01:33:30 +0000 (01:33 +0000)]
am 401453eb: am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit '401453eb9fbd9c914181acfe53a9a33f0350e848':
  Fix blank confirm device credential activity

9 years agoam e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into...
Jorim Jaggi [Tue, 28 Jul 2015 01:19:29 +0000 (01:19 +0000)]
am e0120a8e: am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'e0120a8e382b30c72d45c16ce270d580b2be62cd':
  Adjust choose assist app string

9 years agoam bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential...
Jorim Jaggi [Tue, 28 Jul 2015 01:19:26 +0000 (01:19 +0000)]
am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'bcb0011dd9065f868a7b5e75c8ace4fed49aabb8':
  Fix blank confirm device credential activity

9 years agoam cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 01:06:24 +0000 (01:06 +0000)]
am cc5c7809: am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit 'cc5c7809c5062a3539e11d6650a52ed9010dbd8f':
  Adjust choose assist app string

9 years agoam afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into...
Jorim Jaggi [Tue, 28 Jul 2015 01:06:22 +0000 (01:06 +0000)]
am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'afd5a84830ed2d3dbff2c0a47d92bd34ef398394':
  Fix blank confirm device credential activity

9 years agoMake fingerprint error text a live region
Jorim Jaggi [Tue, 28 Jul 2015 00:59:05 +0000 (17:59 -0700)]
Make fingerprint error text a live region

Bug: 22698141
Change-Id: I85f904a2ab28b2e6f5f204cc80770a10a34b570d

9 years agoam 730389bd: Merge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:45 +0000 (00:50 +0000)]
am 730389bd: Merge "Adjust choose assist app string" into mnc-dev

* commit '730389bd82247a5e92d360a8bb0f5b4f1ded97c2':
  Adjust choose assist app string

9 years agoam dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:50:44 +0000 (00:50 +0000)]
am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity

9 years agoMerge "Adjust choose assist app string" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]
Merge "Adjust choose assist app string" into mnc-dev

9 years agoMerge "Fix blank confirm device credential activity" into mnc-dev
Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]
Merge "Fix blank confirm device credential activity" into mnc-dev

9 years agoAdjust enrollment UI for sw400 devices
Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]
Adjust enrollment UI for sw400 devices

Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b

9 years agoam 6b73c0c6: am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the finge...
Selim Cinek [Mon, 27 Jul 2015 21:55:34 +0000 (21:55 +0000)]
am 6b73c0c6: am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '6b73c0c678d6bae3167f96991f785614e73252a1':
  Autocapitalizing the fingerprint names now

9 years agoam a415d016: am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description...
Selim Cinek [Mon, 27 Jul 2015 21:55:33 +0000 (21:55 +0000)]
am a415d016: am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'a415d01657f2e21b33597cf10e4c1136dc47e157':
  Added content description for the fingerprint icon

9 years agoam c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the...
Selim Cinek [Mon, 27 Jul 2015 21:55:32 +0000 (21:55 +0000)]
am c79a8ee8: am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit 'c79a8ee8d4df7de6811291cb6bea479090cfb2e5':
  Adapted a string in the fingerprint enrollment flow

9 years agoAdjust choose assist app string
Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]
Adjust choose assist app string

Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f

9 years agoam d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names...
Selim Cinek [Mon, 27 Jul 2015 21:39:04 +0000 (21:39 +0000)]
am d1c8a612: am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit 'd1c8a6127dde05d95be25a344879945071bb923f':
  Autocapitalizing the fingerprint names now

9 years agoam d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the finge...
Selim Cinek [Mon, 27 Jul 2015 21:39:02 +0000 (21:39 +0000)]
am d54849ed: am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'd54849ed1546b19ab964f1c2854de127f42c50a6':
  Added content description for the fingerprint icon

9 years agoam 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint...
Selim Cinek [Mon, 27 Jul 2015 21:39:01 +0000 (21:39 +0000)]
am 73f601d6: am 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '73f601d688b85d70cef024bd29bafe2865bb3c29':
  Adapted a string in the fingerprint enrollment flow

9 years agoam 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into...
Selim Cinek [Mon, 27 Jul 2015 21:25:12 +0000 (21:25 +0000)]
am 34877c40: am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '34877c4077ebc15220e8830ec1d2a42143dae901':
  Autocapitalizing the fingerprint names now

9 years agoam ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon...
Selim Cinek [Mon, 27 Jul 2015 21:25:09 +0000 (21:25 +0000)]
am ba887301: am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'ba88730130ab661ac0608821eed082589ba7d97f':
  Added content description for the fingerprint icon

9 years agoam 01b2d812: am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow...
Selim Cinek [Mon, 27 Jul 2015 21:25:07 +0000 (21:25 +0000)]
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

9 years agoam 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:31 +0000 (21:11 +0000)]
am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev

* commit '596ce9bab73204e9c0cd4a4efbb5602f8c6d0024':
  Autocapitalizing the fingerprint names now

9 years agoam a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:30 +0000 (21:11 +0000)]
am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev

* commit 'a8c7c8c891c99ba49167fc0095aab404a85b94bb':
  Added content description for the fingerprint icon

9 years agoam 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 21:11:28 +0000 (21:11 +0000)]
am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

* commit '95ddf903495f97f6d008f8723887228015ed7ead':
  Adapted a string in the fingerprint enrollment flow

9 years agoMerge "Autocapitalizing the fingerprint names now" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]
Merge "Autocapitalizing the fingerprint names now" into mnc-dev

9 years agoMerge "Added content description for the fingerprint icon" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]
Merge "Added content description for the fingerprint icon" into mnc-dev

9 years agoMerge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
Selim Cinek [Mon, 27 Jul 2015 20:57:23 +0000 (20:57 +0000)]
Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev

9 years agoam 0b555932: am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear...
Jorim Jaggi [Mon, 27 Jul 2015 19:56:34 +0000 (19:56 +0000)]
am 0b555932: am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '0b55593283c4b919fac21e057ded15dbae17befd':
  Move PIN/Pattern appear animation to RenderThread (2/2)

9 years agoam 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to...
Jorim Jaggi [Mon, 27 Jul 2015 19:39:41 +0000 (19:39 +0000)]
am 33f430ea: am 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

* commit '33f430ea90ed0b2f315161ef8226eb9459960351':
  Move PIN/Pattern appear animation to RenderThread (2/2)

9 years agoam 9be8c22f: am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint...
Jason Monk [Mon, 27 Jul 2015 19:31:49 +0000 (19:31 +0000)]
am 9be8c22f: am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '9be8c22fbf2a639d0722c585479e496443e2b622':
  Battery summary - tint uid 0 icon

9 years agoam 935b4444: am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread...
Jorim Jaggi [Mon, 27 Jul 2015 19:30:29 +0000 (19:30 +0000)]
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)

9 years agoam 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into...
Jorim Jaggi [Mon, 27 Jul 2015 19:18:34 +0000 (19:18 +0000)]
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)

9 years agoam 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon"...
Jason Monk [Mon, 27 Jul 2015 19:18:19 +0000 (19:18 +0000)]
am 436a8bbe: am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '436a8bbeb06acc49562a236d1f41cfe5f6f053e8':
  Battery summary - tint uid 0 icon

9 years agoam 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 19:04:10 +0000 (19:04 +0000)]
am 3eb14e03: am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3eb14e0383b15a379bd224cabdebe4e5d7366279':
  Battery summary - tint uid 0 icon

9 years agoMerge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
Jorim Jaggi [Mon, 27 Jul 2015 18:55:30 +0000 (18:55 +0000)]
Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev

9 years agoFix blank confirm device credential activity
Jorim Jaggi [Fri, 24 Jul 2015 20:03:12 +0000 (13:03 -0700)]
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

9 years agoam 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:51:45 +0000 (18:51 +0000)]
am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev

* commit '3b521b60d3a1921b5231633105d1ca7afadd9978':
  Battery summary - tint uid 0 icon

9 years agoam ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimizatio...
Jason Monk [Mon, 27 Jul 2015 18:47:32 +0000 (18:47 +0000)]
am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'ebefd240b6dd90a5ccc3da8f74cdc42e8c808ba7':
  Update battery optimization strings

9 years agoam 5babd58a: am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog...
Sanket Padawe [Mon, 27 Jul 2015 18:47:28 +0000 (18:47 +0000)]
am 5babd58a: am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit '5babd58a516e7227652706e856e15a21743f70b1':
  Fix issues in AP dialog arising after clicking on AP preferences.

9 years agoam 1f980cb4: am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage...
Julia Reynolds [Mon, 27 Jul 2015 18:47:27 +0000 (18:47 +0000)]
am 1f980cb4: am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '1f980cb430b7d15415953ecae35c149a22684730':
  Handle app uninstall via Storage & USB.

9 years agoam f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings...
Jason Monk [Mon, 27 Jul 2015 18:36:36 +0000 (18:36 +0000)]
am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'f0b615de0184c740dcaaea75e3f83fde7246d868':
  Update battery optimization strings

9 years agoam f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after...
Sanket Padawe [Mon, 27 Jul 2015 18:36:33 +0000 (18:36 +0000)]
am f9a6c5bb: am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit 'f9a6c5bb2f57e69b8c5e4cace754028e5656ed38':
  Fix issues in AP dialog arising after clicking on AP preferences.

9 years agoam 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 18:36:30 +0000 (18:36 +0000)]
am 82b938c4: am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '82b938c4aeb9522c3d78f904617836e43ea09bf2':
  Handle app uninstall via Storage & USB.

9 years agoMerge "Battery summary - tint uid 0 icon" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]
Merge "Battery summary - tint uid 0 icon" into mnc-dev

9 years agoam b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:19:09 +0000 (18:19 +0000)]
am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
  Update battery optimization strings

9 years agoam 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on...
Sanket Padawe [Mon, 27 Jul 2015 18:19:07 +0000 (18:19 +0000)]
am 970881d9: am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

* commit '970881d912f29775bb4063678c98fa77d3186b9b':
  Fix issues in AP dialog arising after clicking on AP preferences.

9 years agoam 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 18:19:06 +0000 (18:19 +0000)]
am 0c8bee96: am 9a1c0dce: Handle app uninstall via Storage & USB.

* commit '0c8bee9643717519c7d8ca7888068c7baf07b994':
  Handle app uninstall via Storage & USB.

9 years agoam 08cb3983: Merge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 18:06:02 +0000 (18:06 +0000)]
am 08cb3983: Merge "Update battery optimization strings" into mnc-dev

* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
  Update battery optimization strings