OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam c2f62f65: am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
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

9 years agoam 089e9e9a: am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
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'.

9 years agoam 00b5488c: Merge "Change assist app warning message text" into mnc-dev
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

9 years agoam ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
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'.

9 years agoMerge "Change assist app warning message text" into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:26:12 +0000 (17:26 +0000)]
Merge "Change assist app warning message text" into mnc-dev

9 years agoMerge "Change 'data' label to 'data usage'." into mnc-dev
Julia Reynolds [Wed, 29 Jul 2015 17:25:41 +0000 (17:25 +0000)]
Merge "Change 'data' label to 'data usage'." into mnc-dev

9 years agoChange 'data' label to 'data usage'.
Julia Reynolds [Wed, 29 Jul 2015 17:15:14 +0000 (13:15 -0400)]
Change 'data' label to 'data usage'.

Bug: 22350292
Change-Id: I70733b301e734213d2fdec5e7ffb62a7e30ef94c

9 years agoChange assist app warning message text
Julia Reynolds [Wed, 29 Jul 2015 17:01:10 +0000 (13:01 -0400)]
Change assist app warning message text

Bug: 22816916
Change-Id: I43259ab526710fd193a16c6cb49580042dca8555

9 years agoam cb176a41: am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
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

9 years agoam 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
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

9 years agoMerge "fix InactiveApps instrumentation" into mnc-dev
Chris Wren [Wed, 29 Jul 2015 14:57:14 +0000 (14:57 +0000)]
Merge "fix InactiveApps instrumentation" into mnc-dev

9 years agoam fe6fc96a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
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

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 29 Jul 2015 13:59:28 +0000 (13:59 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

9 years agoImport translations. DO NOT MERGE
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

9 years agoam 3c975a9f: am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
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.

9 years agoam edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
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.

9 years agoMerge "Add contactless symbol to NFC resources." into mnc-dev
Martijn Coenen [Wed, 29 Jul 2015 13:21:40 +0000 (13:21 +0000)]
Merge "Add contactless symbol to NFC resources." into mnc-dev

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 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 agoAdd contactless symbol to NFC resources.
Martijn Coenen [Wed, 29 Jul 2015 08:10:35 +0000 (10:10 +0200)]
Add contactless symbol to NFC resources.

Bug: 22534220
Change-Id: I9227d74386716520d2cf98d7f032051815f34431

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 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 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 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 InactiveApps instrumentation
Chris Wren [Tue, 28 Jul 2015 16:44:37 +0000 (12:44 -0400)]
fix InactiveApps instrumentation

Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c

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

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

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

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

* commit '9a1c0dce7a496f51087cf0497b931a31c64b0a65':
  Handle app uninstall via Storage & USB.

9 years agoMerge "Update battery optimization strings" into mnc-dev
Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]
Merge "Update battery optimization strings" into mnc-dev

9 years agoMerge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
Sanket Padawe [Mon, 27 Jul 2015 17:31:42 +0000 (17:31 +0000)]
Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev

9 years agoBattery summary - tint uid 0 icon
Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]
Battery summary - tint uid 0 icon

Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b

9 years agoUpdate battery optimization strings
Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]
Update battery optimization strings

Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa

9 years agoHandle app uninstall via Storage & USB.
Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]
Handle app uninstall via Storage & USB.

Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2

9 years agoam aeae201d: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 14:12:29 +0000 (14:12 +0000)]
am aeae201d: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 27 Jul 2015 13:53:25 +0000 (06:53 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 15:54:27 +0000 (15:54 +0000)]
am 7b5c7e56: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE

* commit '7b5c7e56553cfe6d8bcca5b56f8f96772b6f98ef':
  Import translations. DO NOT MERGE

9 years agoam 5ada0050: am 38c9b9eb: Update FRP warning to spec
Adrian Roos [Sat, 25 Jul 2015 15:54:26 +0000 (15:54 +0000)]
am 5ada0050: am 38c9b9eb: Update FRP warning to spec

* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec

9 years agoam 92ca0cbe: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 15:53:32 +0000 (15:53 +0000)]
am 92ca0cbe: (-s ours) Import translations. DO NOT MERGE

* commit '92ca0cbe8f0aab2d6efe59f384611275ea8aef00':
  Import translations. DO NOT MERGE

9 years agoam e37e1232: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 00:59:51 +0000 (00:59 +0000)]
am e37e1232: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 38c9b9eb: Update FRP warning to spec
Adrian Roos [Sat, 25 Jul 2015 00:59:08 +0000 (00:59 +0000)]
am 38c9b9eb: Update FRP warning to spec

* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Sat, 25 Jul 2015 00:09:25 +0000 (17:09 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Fri, 24 Jul 2015 23:56:10 +0000 (16:56 -0700)]
Import translations. DO NOT MERGE

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

9 years agoAutocapitalizing the fingerprint names now
Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]
Autocapitalizing the fingerprint names now

Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86

9 years agoHide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED
Zach Johnson [Fri, 24 Jul 2015 21:56:30 +0000 (14:56 -0700)]
Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED

Once they are enabled for the first time, they'll show up indefinitely.

b/22667081

Change-Id: Ia28de99d7d638d54c15fac2e08edeb70a9657e23

9 years agoAdded content description for the fingerprint icon
Selim Cinek [Thu, 23 Jul 2015 22:05:38 +0000 (15:05 -0700)]
Added content description for the fingerprint icon

Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804