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

Jason Monk [Tue, 11 Aug 2015 14:12:00 +0000 (14:12 +0000)]

am 31227bfa: am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '31227bfaf12ede192474bb162f1555215ffa605b':
Add setting to disable camera gesture

commit | commitdiff | tree

Jason Monk [Tue, 11 Aug 2015 14:08:02 +0000 (14:08 +0000)]

am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
Add setting to disable camera gesture

commit | commitdiff | tree

Jason Monk [Tue, 11 Aug 2015 14:02:37 +0000 (14:02 +0000)]

am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev

* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
Add setting to disable camera gesture

commit | commitdiff | tree

Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]

Merge "Add setting to disable camera gesture" into mnc-dr-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:42:51 +0000 (00:42 +0000)]

am b98206c9: am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit 'b98206c99e687d043702df01d6a7a4a4273c82a8':
Fix issue #23037899: Support for Battery Optimization permission + Dialog

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:35:12 +0000 (00:35 +0000)]

am 01cfaade: am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit '01cfaadeeb9eb98f9a772a85ba6c4e1034319fb5':
Fix issue #23037899: Support for Battery Optimization permission + Dialog

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:33:41 +0000 (00:33 +0000)]

am c262c522: am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'c262c522ae2ae31b5a6d1217efb40cbf81bbef59':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:28:17 +0000 (00:28 +0000)]

am e9bcef35: am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
Fix issue #23037899: Support for Battery Optimization permission + Dialog

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:27:06 +0000 (00:27 +0000)]

am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '6fcacc41273a195dfa0f4cbca93c4eafe32edd1d':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:19:40 +0000 (00:19 +0000)]

am be4df036: Fix issue #23037899: Support for Battery Optimization permission + Dialog

* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #23037899: Support for Battery Optimization permission + Dialog

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:19:07 +0000 (00:19 +0000)]

am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:11:09 +0000 (00:11 +0000)]

am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 21:53:33 +0000 (14:53 -0700)]

Fix issue #23037899: Support for Battery Optimization permission + Dialog

New pretty dialog.

Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]

Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 00:03:38 +0000 (17:03 -0700)]

Fix issue #23037720: New Battery Optimization Strings

No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 22:21:22 +0000 (22:21 +0000)]

am 6ae019e7: am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '6ae019e74b9dcd10fb99fd684c5cd0114cc01ed9':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 22:15:13 +0000 (22:15 +0000)]

am cbfb4c4b: am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'cbfb4c4bff60c37ca04887a6e9cdd01fcdbf1a67':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 22:07:13 +0000 (22:07 +0000)]

am fa8a85da: am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'fa8a85da05a9deea9b1ae249a490b63e46058eff':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 22:02:23 +0000 (22:02 +0000)]

am 996e285c: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]

Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Mon, 10 Aug 2015 20:59:29 +0000 (20:59 +0000)]

am 415d6a24: am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit '415d6a2411edfd72764bfd82208eff6020d85add':
Wrap text on long preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 10 Aug 2015 20:53:31 +0000 (20:53 +0000)]

am f47896d2: am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit 'f47896d223c715a6f480a0c7be36fc1206caf404':
Wrap text on long preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 10 Aug 2015 20:45:56 +0000 (20:45 +0000)]

am 77dc56bc: am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
Wrap text on long preferences.

commit | commitdiff | tree

Julia Reynolds [Mon, 10 Aug 2015 20:37:34 +0000 (20:37 +0000)]

am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev

* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 20:34:04 +0000 (20:34 +0000)]

am 55511dab: am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit '55511dab4fcd7410868670a6d39e88a91784d722':
Remove extra help & feedback menu from power usage

commit | commitdiff | tree

Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]

Merge "Wrap text on long preferences." into mnc-dev

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 20:30:11 +0000 (20:30 +0000)]

am 9614b503: am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit '9614b50319f8e22640fa43bb3623c41c5f412338':
Remove extra help & feedback menu from power usage

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 20:21:53 +0000 (20:21 +0000)]

am a1f64bf2: am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit 'a1f64bf207c452f9b0e6a558538d9614ca2bf655':
Remove extra help & feedback menu from power usage

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 20:14:46 +0000 (20:14 +0000)]

am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev

* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 20:09:20 +0000 (20:09 +0000)]

Merge "Remove extra help & feedback menu from power usage" into mnc-dev

commit | commitdiff | tree

Jason Monk [Mon, 10 Aug 2015 19:58:09 +0000 (15:58 -0400)]

Remove extra help & feedback menu from power usage

Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:58:10 +0000 (17:58 +0000)]

am 7381ed0d: am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit '7381ed0d9b1e34466fd6486b49a98a002267fcb2':
Ensure that listener is removed only if it was added

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:51:31 +0000 (17:51 +0000)]

am 05c4a757: am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit '05c4a75701f1b1d56255b74a15cf28a018ad659a':
Ensure that listener is removed only if it was added

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:41:22 +0000 (17:41 +0000)]

am f48424e1: am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit 'f48424e17caf6d4e890154d45c70a125802e1682':
Ensure that listener is removed only if it was added

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:35:16 +0000 (17:35 +0000)]

am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev

* commit '8cf54264995aea65d77c25b5050cb3aac0196c59':
Ensure that listener is removed only if it was added

commit | commitdiff | tree

Pavel Zhamaitsiak [Mon, 10 Aug 2015 17:29:38 +0000 (17:29 +0000)]

Merge "Ensure that listener is removed only if it was added" into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 10 Aug 2015 14:26:55 +0000 (14:26 +0000)]

am d0aa60ed: (-s ours) am 23127a61: (-s ours) am 41abf663: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Mon, 10 Aug 2015 14:20:54 +0000 (14:20 +0000)]

am 23127a61: (-s ours) am 41abf663: (-s ours) Import translations. DO NOT MERGE

* commit '23127a6123ed72451185ff5cdaa02b3c617cafe7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 10 Aug 2015 14:12:22 +0000 (14:12 +0000)]

am 41abf663: (-s ours) Import translations. DO NOT MERGE

* commit '41abf66362ccf9f75dc67142b48d0f31c13f1d3d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 10 Aug 2015 14:03:46 +0000 (07:03 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Sat, 8 Aug 2015 14:53:06 +0000 (14:53 +0000)]

am 40a54fd8: (-s ours) am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE

* commit '40a54fd8081ee2908aefeffafb71b84ea2b067e8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Sat, 8 Aug 2015 14:45:45 +0000 (14:45 +0000)]

am c064ecdf: (-s ours) am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Sat, 8 Aug 2015 14:36:30 +0000 (14:36 +0000)]

am 3ca58bbd: (-s ours) Import translations. DO NOT MERGE

* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Sat, 8 Aug 2015 14:26:58 +0000 (07:26 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Jeff Sharkey [Sat, 8 Aug 2015 00:13:16 +0000 (00:13 +0000)]

am 0f4465a4: am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit '0f4465a4cd84ba8acac52cafc13104b6dc054877':
Block moving when already in progress.

commit | commitdiff | tree

Jeff Sharkey [Sat, 8 Aug 2015 00:06:40 +0000 (00:06 +0000)]

am 11088b81: am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit '11088b815b030114b14f8a3e7d81d9238c2d51b8':
Block moving when already in progress.

commit | commitdiff | tree

Jeff Sharkey [Fri, 7 Aug 2015 23:58:46 +0000 (23:58 +0000)]

am cb0c0718: am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
Block moving when already in progress.

commit | commitdiff | tree

Jeff Sharkey [Fri, 7 Aug 2015 23:51:57 +0000 (23:51 +0000)]

am 67f0739c: Merge "Block moving when already in progress." into mnc-dev

* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.

commit | commitdiff | tree

Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]

Merge "Block moving when already in progress." into mnc-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 7 Aug 2015 22:59:28 +0000 (15:59 -0700)]

Block moving when already in progress.

Use frozen state as a proxy for knowing if a package is currently
being moved, and block any new move requests until the current move
is finished.

Bug: 22069486
Change-Id: I50a70353132c1035b969982f0b7779f5dcb2251d

commit | commitdiff | tree

Billy Lau [Fri, 7 Aug 2015 22:42:55 +0000 (22:42 +0000)]

am 16dc289d: am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '16dc289d5b29ecccf02fc86349ab53cbc10e6b11':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

commit | commitdiff | tree

Billy Lau [Fri, 7 Aug 2015 22:36:29 +0000 (22:36 +0000)]

am 8c26cbd8: am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '8c26cbd87e8fe5880f84c5a27c89176e045f6669':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

commit | commitdiff | tree

Billy Lau [Fri, 7 Aug 2015 22:28:38 +0000 (22:28 +0000)]

am 5b2c66e4: am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit '5b2c66e4da749ca59d09776ec7831e20d1211909':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 22:25:36 +0000 (22:25 +0000)]

am a3e66576: am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'a3e665765882c7919d8d41dc5caa42d1e17b6044':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Billy Lau [Fri, 7 Aug 2015 22:22:19 +0000 (22:22 +0000)]

am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

* commit 'a59f39fca65d0828b0e4ade95a8404282e858ba9':
Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 22:20:50 +0000 (22:20 +0000)]

am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '1ded441390e79dc46d576dadbbf1a69da12d399d':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Billy Lau [Fri, 7 Aug 2015 22:15:32 +0000 (22:15 +0000)]

Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 22:12:58 +0000 (22:12 +0000)]

am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 22:05:56 +0000 (22:05 +0000)]

am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
Fix issue #23037720: New Battery Optimization Strings

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 21:58:52 +0000 (21:58 +0000)]

Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]

Fix issue #23037720: New Battery Optimization Strings

Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e

commit | commitdiff | tree

Dianne Hackborn [Fri, 7 Aug 2015 21:38:06 +0000 (14:38 -0700)]

Fix issue #23037720: New Battery Optimization Strings

There be strings.

Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c

commit | commitdiff | tree

Pavel Zhamaitsiak [Fri, 7 Aug 2015 19:02:38 +0000 (12:02 -0700)]

Ensure that listener is removed only if it was added

Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200

commit | commitdiff | tree

Julia Reynolds [Fri, 7 Aug 2015 16:57:50 +0000 (16:57 +0000)]

am 559a3e78: am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit '559a3e788652d448c2c95e2c024cf9f444258ca7':
Hide optimization control on battery details page for non whitelisted apps.

commit | commitdiff | tree

Julia Reynolds [Fri, 7 Aug 2015 16:52:11 +0000 (16:52 +0000)]

am e113f0c4: am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit 'e113f0c4876b7529170768f8c7cf99f218d48ca8':
Hide optimization control on battery details page for non whitelisted apps.

commit | commitdiff | tree

Julia Reynolds [Fri, 7 Aug 2015 16:45:04 +0000 (16:45 +0000)]

am b7028f25: am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit 'b7028f254de1f7fdda5c3ee248f2e5a9294cc4dd':
Hide optimization control on battery details page for non whitelisted apps.

commit | commitdiff | tree

Julia Reynolds [Fri, 7 Aug 2015 16:34:58 +0000 (16:34 +0000)]

am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

* commit '5ab0e183abdd4008c5591011804d0bc770851a7f':
Hide optimization control on battery details page for non whitelisted apps.

commit | commitdiff | tree

Julia Reynolds [Fri, 7 Aug 2015 16:29:41 +0000 (16:29 +0000)]

Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev

commit | commitdiff | tree

Geoff Mendal [Fri, 7 Aug 2015 05:02:05 +0000 (05:02 +0000)]

am 75a77cc7: (-s ours) am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '75a77cc77d30be0b8eb7b0e8dbd398ba1d8321cb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 7 Aug 2015 04:55:25 +0000 (04:55 +0000)]

am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 7 Aug 2015 04:48:08 +0000 (04:48 +0000)]

am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 7 Aug 2015 04:44:05 +0000 (04:44 +0000)]

am 2d546b77: (-s ours) Import translations. DO NOT MERGE

* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Fri, 7 Aug 2015 04:20:12 +0000 (21:20 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd

commit | commitdiff | tree

Andres Morales [Thu, 6 Aug 2015 22:49:32 +0000 (22:49 +0000)]

am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit 'ae560bf189a7f738d67e87ed78579203b99a0066':
fix CC for work profiles

commit | commitdiff | tree

Andres Morales [Thu, 6 Aug 2015 22:41:42 +0000 (22:41 +0000)]

am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
fix CC for work profiles

commit | commitdiff | tree

Andres Morales [Thu, 6 Aug 2015 22:36:04 +0000 (22:36 +0000)]

am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
fix CC for work profiles

commit | commitdiff | tree

Andres Morales [Thu, 6 Aug 2015 22:30:55 +0000 (22:30 +0000)]

am 4897fa87: Merge "fix CC for work profiles" into mnc-dev

* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
fix CC for work profiles

commit | commitdiff | tree

Andres Morales [Thu, 6 Aug 2015 22:22:17 +0000 (22:22 +0000)]

Merge "fix CC for work profiles" into mnc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 6 Aug 2015 18:21:31 +0000 (14:21 -0400)]

Wrap text on long preferences.

Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12

commit | commitdiff | tree

Julia Reynolds [Thu, 6 Aug 2015 14:54:44 +0000 (10:54 -0400)]

Hide optimization control on battery details page for non whitelisted apps.

Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:38:14 +0000 (04:38 +0000)]

am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '79aed4774745113f5b110fcfd82a3ee64ff6ecc1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)]

am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:29:29 +0000 (04:29 +0000)]

am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '870ba02933fa364660384944fa13ac0a94cab1b5':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)]

am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '18d8682802460074f4b0e628bae4d4051d542c77':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)]

am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:20:45 +0000 (04:20 +0000)]

am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '90c2297645341f347f56b160f06551963c64d039':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]

am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Andres Morales [Tue, 4 Aug 2015 23:55:00 +0000 (16:55 -0700)]

fix CC for work profiles

Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c

commit | commitdiff | tree

Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa

commit | commitdiff | tree

Jason Monk [Wed, 5 Aug 2015 20:52:19 +0000 (20:52 +0000)]

am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '854533a82d5cfeac27e80b610544291c5be4fa39':
Hide show/hide system from battery optimizations list

commit | commitdiff | tree

Jason Monk [Wed, 5 Aug 2015 20:44:41 +0000 (20:44 +0000)]

am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
Hide show/hide system from battery optimizations list

commit | commitdiff | tree

Jason Monk [Wed, 5 Aug 2015 20:37:17 +0000 (20:37 +0000)]

am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
Hide show/hide system from battery optimizations list

commit | commitdiff | tree

Sanket Padawe [Wed, 5 Aug 2015 20:33:11 +0000 (20:33 +0000)]

am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '95a524a4ffd2da1873b9ac023f985afac4691b82':
Check for special char when renaming device for Wi-Fi direct.

commit | commitdiff | tree

Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]

am 888673bd: Hide show/hide system from battery optimizations list

* commit '888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list

commit | commitdiff | tree

Sanket Padawe [Wed, 5 Aug 2015 20:27:24 +0000 (20:27 +0000)]

am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
Check for special char when renaming device for Wi-Fi direct.

commit | commitdiff | tree

Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]

am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
Check for special char when renaming device for Wi-Fi direct.

commit | commitdiff | tree

Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]

am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '151612fb0de35fd2fadb096511f108b433100149':
Check for special char when renaming device for Wi-Fi direct.

commit | commitdiff | tree

Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]

Hide show/hide system from battery optimizations list

Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc

commit | commitdiff | tree

Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]

am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '5f9d15ed252e0870097533bd75a759f28f2bda0d':
Check for special char when renaming device for Wi-Fi direct.