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

Jason Monk [Thu, 30 Jul 2015 15:22:41 +0000 (15:22 +0000)]

am 19128bd1: Extend char limit by small amount

* commit '19128bd1679cfcad3e38a447dd4584fa5280920f':
Extend char limit by small amount

commit | commitdiff | tree

Jason Monk [Thu, 30 Jul 2015 15:05:09 +0000 (11:05 -0400)]

Extend char limit by small amount

Bug: 22822007
Bug: 22687961
Change-Id: I9a1528dc7175cfd530900e51d2210224ff07ab23

commit | commitdiff | tree

Geoff Mendal [Thu, 30 Jul 2015 12:46:45 +0000 (12:46 +0000)]

am 597d75ea: (-s ours) Import translations. DO NOT MERGE

* commit '597d75eaad03047d0f55c49ce9c0d788f5a72a72':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 30 Jul 2015 12:35:46 +0000 (05:35 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 22:50:48 +0000 (22:50 +0000)]

am 53f771d8: (-s ours) Import translations. DO NOT MERGE

* commit '53f771d8218c553248d0954fba2f25b4257838b2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 29 Jul 2015 22:31:28 +0000 (15:31 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Jorim Jaggi [Wed, 29 Jul 2015 22:14:09 +0000 (22:14 +0000)]

am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '23ace01340906e9615f747b0adeaac4bf7bf1dc2':
Adjustments for find sensor screen

commit | commitdiff | tree

Jorim Jaggi [Wed, 29 Jul 2015 21:58:43 +0000 (21:58 +0000)]

Merge "Adjustments for find sensor screen" into mnc-dev

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

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

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

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:11:21 +0000 (16:11 +0000)]

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

* commit '2a56d7f23b4ef87ffb44ab6fcc4fbae6283a3242':
fix InactiveApps instrumentation

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

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

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

Jorim Jaggi [Tue, 28 Jul 2015 23:55:00 +0000 (16:55 -0700)]

Adjustments for find sensor screen

Bug: 22484203
Change-Id: I3adb258c60eb165d7d4e695705dc430fc2dd4170

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

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

Bump string char limit.

Bug: 19561615
Change-Id: I605becd30c0bece146a57995a0cd416d1c55c837

commit | commitdiff | tree

Maurice Lam [Tue, 21 Jul 2015 18:36:43 +0000 (11:36 -0700)]

[ZenMode] Align text to viewStart in remove dialog

Bug: 22274462
Change-Id: I696c4b33c111a61b51e1581fd4a2830fc1844f40

commit | commitdiff | tree

Chris Wren [Tue, 28 Jul 2015 16:44:37 +0000 (12:44 -0400)]

fix InactiveApps instrumentation

Bug: 21114836
Change-Id: I84357981158d057c2d302822801fb54ad82a901c

commit | commitdiff | tree

Martijn Coenen [Mon, 27 Jul 2015 14:09:56 +0000 (16:09 +0200)]

Fix tap & pay strings.

Bug: 22534220
Bug: 22762332
Change-Id: Ifd98a6cf0490b6dd59cc6a0957db45509d6fd1d7

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:39:12 +0000 (00:39 +0000)]

Merge "Adjust choose assist app string" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:36:00 +0000 (00:36 +0000)]

Merge "Fix blank confirm device credential activity" into mnc-dev

commit | commitdiff | tree

Jorim Jaggi [Tue, 28 Jul 2015 00:31:23 +0000 (17:31 -0700)]

Adjust enrollment UI for sw400 devices

Bug: 22511825
Change-Id: Id2534a6a4ea99c295aa6ff583ff7755e5dfa339b

commit | commitdiff | tree

Jorim Jaggi [Mon, 27 Jul 2015 21:52:02 +0000 (14:52 -0700)]

Adjust choose assist app string

Bug: 22512392
Change-Id: Ibbaacd505139dcabfca07554e93bd1d3aacc861f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 20:58:01 +0000 (20:58 +0000)]

Merge "Autocapitalizing the fingerprint names now" into mnc-dev

commit | commitdiff | tree

Selim Cinek [Mon, 27 Jul 2015 20:57:45 +0000 (20:57 +0000)]

Merge "Added content description for the fingerprint icon" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 18:36:10 +0000 (18:36 +0000)]

Merge "Battery summary - tint uid 0 icon" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 17:39:54 +0000 (17:39 +0000)]

Merge "Update battery optimization strings" into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 17:03:42 +0000 (13:03 -0400)]

Battery summary - tint uid 0 icon

Bug: 22657823
Change-Id: If360420ada70777520ccc682022f7f4e2e50a70b

commit | commitdiff | tree

Jason Monk [Mon, 27 Jul 2015 15:23:15 +0000 (11:23 -0400)]

Update battery optimization strings

Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa

commit | commitdiff | tree

Julia Reynolds [Mon, 27 Jul 2015 15:13:25 +0000 (11:13 -0400)]

Handle app uninstall via Storage & USB.

Bug: 22702406
Change-Id: Ie02fd53be93cad1af043be2c573bd650fc1c0df2

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Selim Cinek [Fri, 24 Jul 2015 23:50:16 +0000 (16:50 -0700)]

Autocapitalizing the fingerprint names now

Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Adrian Roos [Fri, 24 Jul 2015 18:30:14 +0000 (11:30 -0700)]

Update FRP warning to spec

Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227

commit | commitdiff | tree

Sanket Padawe [Fri, 24 Jul 2015 20:52:03 +0000 (13:52 -0700)]

Fix issues in AP dialog arising after clicking on AP preferences.

+Added a new flag to keep track if user wanted to modify AP by hard
pressing on AP.

Bug: 22485686
Change-Id: Ia60a564a5344393f5e5340a3493ae7c660ead3d7

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 03:17:43 +0000 (03:17 +0000)]

am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

* commit '36c760140900b2bc6aa2c7287199dae4ca86c568':
[Fingerprint] Show skip button during SUW

commit | commitdiff | tree

Maurice Lam [Fri, 24 Jul 2015 03:08:29 +0000 (03:08 +0000)]

Merge "[Fingerprint] Show skip button during SUW" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:40:16 +0000 (01:40 +0000)]

am 5376d54e: (-s ours) Import translations. DO NOT MERGE

* commit '5376d54e8eccc45586e5225b6ec7d6637399270f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:23:19 +0000 (18:23 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Fri, 24 Jul 2015 01:10:24 +0000 (18:10 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Selim Cinek [Thu, 23 Jul 2015 21:46:44 +0000 (14:46 -0700)]

Adapted a string in the fingerprint enrollment flow

Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376

commit | commitdiff | tree

Svetoslav Ganov [Thu, 23 Jul 2015 21:56:56 +0000 (21:56 +0000)]

am cce844a7: Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

* commit 'cce844a7a31c4aec0770c40c7a9a805cb48b9f31':
Reset permissions and app links when clearing app preferences - settings

commit | commitdiff | tree

Svetoslav Ganov [Thu, 23 Jul 2015 21:47:10 +0000 (21:47 +0000)]

Merge "Reset permissions and app links when clearing app preferences - settings" into mnc-dev

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:32:34 +0000 (20:32 +0000)]

am 8bf5f307: Merge "Fix battery detail issues with "Android OS"" into mnc-dev

* commit '8bf5f3075e6e0797e96a861330b7ff82eee88bee':
Fix battery detail issues with "Android OS"

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:32:32 +0000 (20:32 +0000)]

am 9927acd3: Merge "Don\'t show disabled apps in ignore optimizations" into mnc-dev

* commit '9927acd3ad67ce2cc20e9f9c06af442f6ba69c8f':
Don't show disabled apps in ignore optimizations

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:23:57 +0000 (20:23 +0000)]

Merge "Fix battery detail issues with "Android OS"" into mnc-dev

commit | commitdiff | tree

Jason Monk [Thu, 23 Jul 2015 20:23:09 +0000 (20:23 +0000)]

Merge "Don't show disabled apps in ignore optimizations" into mnc-dev

commit | commitdiff | tree

Guang Zhu [Thu, 23 Jul 2015 19:32:40 +0000 (19:32 +0000)]

am c1bef743: Prevent monkey from changing adoptable storage settings

* commit 'c1bef7430e1c49b9c3b2312328d3600261109ee8':
Prevent monkey from changing adoptable storage settings

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 23 Jul 2015 19:13:06 +0000 (19:13 +0000)]

am d9e0ed1b: Merge "Add or remove WFC setting when Wireless settings activity is resumed" into mnc-dev

* commit 'd9e0ed1b3e8d1584496d041a1081aaea9fdc7d41':
Add or remove WFC setting when Wireless settings activity is resumed