git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Maurice Lam [Wed, 29 Jul 2015 22:03:37 +0000 (22:03 +0000)]

am e27b5590: am 4921339a: am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit 'e27b5590986c378ae225d91ec258a85f4428f00b':
[ZenMode] Align text to viewStart in remove dialog

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 22:02:33 +0000 (22:02 +0000)]

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

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 22:02:31 +0000 (22:02 +0000)]

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'.

commit | commitdiff | tree

Maurice Lam [Wed, 29 Jul 2015 19:35:53 +0000 (19:35 +0000)]

am 4921339a: am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '4921339acc0a670ba9fdefe612667db9f8d50bc6':
[ZenMode] Align text to viewStart in remove dialog

commit | commitdiff | tree

Maurice Lam [Wed, 29 Jul 2015 19:13:30 +0000 (19:13 +0000)]

am 0ce45dbb: am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '0ce45dbbe74c45f89098cde7239c257e3cf87d5d':
[ZenMode] Align text to viewStart in remove dialog

commit | commitdiff | tree

Maurice Lam [Wed, 29 Jul 2015 18:53:41 +0000 (18:53 +0000)]

am 1df9a7cc: am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '1df9a7cc16a9dd9892b633aad4ec246677d2c6b5':
[ZenMode] Align text to viewStart in remove dialog

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:52:51 +0000 (18:52 +0000)]

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

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:52:49 +0000 (18:52 +0000)]

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'.

commit | commitdiff | tree

Maurice Lam [Wed, 29 Jul 2015 18:39:00 +0000 (18:39 +0000)]

am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

* commit '3760e5e7e4ae17012cf0f336fa0d8d62ecbf5e69':
[ZenMode] Align text to viewStart in remove dialog

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:30:46 +0000 (18:30 +0000)]

am 24a1ac36: am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit '24a1ac3620f8fd983f42d38d24a32b13f74b8cda':
Change assist app warning message text

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:30:45 +0000 (18:30 +0000)]

am 6785be73: am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit '6785be7362a158926e36f0bfe3f721082c9be3f3':
Change 'data' label to 'data usage'.

commit | commitdiff | tree

Maurice Lam [Wed, 29 Jul 2015 18:25:48 +0000 (18:25 +0000)]

Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:03:57 +0000 (18:03 +0000)]

am c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit 'c2f62f650a16aead5f6806ca2ac7ae400775c935':
Change assist app warning message text

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 18:03:56 +0000 (18:03 +0000)]

am 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit '089e9e9a0dc4ad2c87e0ca79c16b6375b9623554':
Change 'data' label to 'data usage'.

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:41:15 +0000 (17:41 +0000)]

am 00b5488c: Merge "Change assist app warning message text" into mnc-dev

* commit '00b5488c67d3e7d1fd2905a24a6382f81026e5e7':
Change assist app warning message text

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:41:14 +0000 (17:41 +0000)]

am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev

* commit 'ae422fd0991e5dd8fab6816153ed0f4b6653beb0':
Change 'data' label to 'data usage'.

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 17:31:01 +0000 (17:31 +0000)]

am 96117fc7: am 97ad12db: am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '96117fc751d45f8ab307512821c9a19ee48249f6':
fix InactiveApps instrumentation

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]

Merge "Change assist app warning message text" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:25:41 +0000 (17:25 +0000)]

Merge "Change 'data' label to 'data usage'." into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]

Change 'data' label to 'data usage'.

Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 17:08:51 +0000 (17:08 +0000)]

am 97ad12db: am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '97ad12db5c36792870888b5d4a0f0c8d35bf059b':
fix InactiveApps instrumentation

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]

Change assist app warning message text

Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 16:49:46 +0000 (16:49 +0000)]

am 59f07cc7: am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '59f07cc7c80b144c3ee618955fa6d8121347a6a7':
fix InactiveApps instrumentation

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 16:26:32 +0000 (16:26 +0000)]

am cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit 'cb176a41ad0ac94a65ed13bf1e18242f8220bd5b':
fix InactiveApps instrumentation

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 16:11:21 +0000 (16:11 +0000)]

am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev

* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
fix InactiveApps instrumentation

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 15:16:00 +0000 (15:16 +0000)]

am ba648051: (-s ours) am 6e639eec: (-s ours) am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'ba648051abb05b17a9739532da894441e3e27caf':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 14:59:11 +0000 (14:59 +0000)]

am 6e639eec: (-s ours) am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '6e639eec1211977e521189b1a00be28f4c1def2a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 14:57:59 +0000 (14:57 +0000)]

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.

commit | commitdiff | tree

Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]

Merge "fix InactiveApps instrumentation" into mnc-dev

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 14:36:49 +0000 (14:36 +0000)]

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.

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 14:36:40 +0000 (14:36 +0000)]

am f13f08be: (-s ours) am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'f13f08be291ff5cfe52b6fc99112e533698af41a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 14:16:35 +0000 (14:16 +0000)]

am d93b6412: am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit 'd93b6412801706311b9389f789ecdf76969695db':
Add contactless symbol to NFC resources.

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 14:15:18 +0000 (14:15 +0000)]

am fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'fe6fc96a59903f77663ae5435183055be9cc5b74':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 13:59:28 +0000 (13:59 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 13:56:59 +0000 (06:56 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ic5113dd5d45744811ac6ca45f037333b7f659362
Auto-generated-cl: translation import

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 13:55:10 +0000 (13:55 +0000)]

am 56cdfbf6: am 3d6a40af: am 1990f8f7: am cb91edae: am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev

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

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 13:55:08 +0000 (13:55 +0000)]

am 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit '3c975a9fc15c39077613ce741e71fa2baf789492':
Add contactless symbol to NFC resources.

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 13:55:08 +0000 (13:55 +0000)]

am 9062cdba: am 826400bd: am f2d5e02c: am 39768c86: am f889faaf: Merge "Bump string char limit." into mnc-dev

* commit '9062cdba945cbb493df54b5a7ab61a514283d0e0':
Bump string char limit.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 13:34:38 +0000 (13:34 +0000)]

am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev

* commit 'edb2668c6d7d2ccfc3b7b42abcc9b46ffdf3d155':
Add contactless symbol to NFC resources.

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 13:21:40 +0000 (13:21 +0000)]

Merge "Add contactless symbol to NFC resources." into mnc-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 13:05:53 +0000 (06:05 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ief396718afca7ea286c8ad923eb1448074fd2d4d
Auto-generated-cl: translation import

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Wed, 29 Jul 2015 12:25:28 +0000 (12:25 +0000)]

Merge "Bump string char limit." into mnc-dev

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 11:04:34 +0000 (11:04 +0000)]

am 25f86b0f: am 120ed352: am b0390ed0: am de661d5b: am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev

* commit '25f86b0fafc1c9d656ce8aab305137c41662b037':
Fix tap & pay strings.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]

Add contactless symbol to NFC resources.

Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431

commit | commitdiff | tree

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.

commit | commitdiff | tree

Martijn Coenen [Wed, 29 Jul 2015 07:54:04 +0000 (07:54 +0000)]

Merge "Fix tap & pay strings." into mnc-dev

commit | commitdiff | tree

Zach Johnson [Wed, 29 Jul 2015 00:17:17 +0000 (00:17 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 22:05:06 +0000 (22:05 +0000)]

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.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 22:05:03 +0000 (22:05 +0000)]

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:19 +0000 (21:38 +0000)]

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:17 +0000 (21:38 +0000)]

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 21:38:16 +0000 (21:38 +0000)]

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 20:32:08 +0000 (20:32 +0000)]

Merge "Prevent crash in app memory updater." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 19:51:03 +0000 (19:51 +0000)]

Merge "Make fingerprint error text a live region" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 19:50:47 +0000 (19:50 +0000)]

Merge "Adjust enrollment UI for sw400 devices" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 19:49:39 +0000 (15:49 -0400)]

Prevent crash in app memory updater.

Bug: 22768769
Change-Id: I1eec14f5ffb46390aa6060babf86fc88ad76a16d

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 18:47:21 +0000 (18:47 +0000)]

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 18:47:17 +0000 (18:47 +0000)]

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

commit | commitdiff | tree

Xiaohui Chen [Tue, 28 Jul 2015 17:39:59 +0000 (17:39 +0000)]

Merge "sys user split: first pass updating Settings"

commit | commitdiff | tree

Julia Reynolds [Tue, 28 Jul 2015 17:39:24 +0000 (13:39 -0400)]

Bump string char limit.

Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837