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

Dianne Hackborn [Thu, 13 Aug 2015 01:18:08 +0000 (01:18 +0000)]

am cd2b9e12: am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit 'cd2b9e1217ef622dcd5127715c9ee5b3db6504ee':
Fix issue #23116383: Include security patch level in Settings

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Aug 2015 01:09:10 +0000 (01:09 +0000)]

am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '2be290cf36f06da260e67b430a625422da512609':
Fix issue #23116383: Include security patch level in Settings

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Aug 2015 01:02:23 +0000 (01:02 +0000)]

am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
Fix issue #23116383: Include security patch level in Settings

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Aug 2015 00:54:31 +0000 (00:54 +0000)]

am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #23116383: Include security patch level in Settings

commit | commitdiff | tree

Dianne Hackborn [Thu, 13 Aug 2015 00:46:58 +0000 (00:46 +0000)]

Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev

commit | commitdiff | tree

Dianne Hackborn [Wed, 12 Aug 2015 23:11:46 +0000 (16:11 -0700)]

Fix issue #23116383: Include security patch level in Settings

Change-Id: I003564376a02a70f0245353472544cde355240ac

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Aug 2015 18:03:56 +0000 (18:03 +0000)]

am 8d425a52: am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit '8d425a526b383c1e0c2d60fd3c27f7a5dd5e5e2f':
Avoid sending identity along with EAP sim, aka & aka'.

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Aug 2015 17:50:54 +0000 (17:50 +0000)]

am d0513282: am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit 'd0513282f81d8218eb0fef93a7316a6699d087f7':
Avoid sending identity along with EAP sim, aka & aka'.

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Aug 2015 17:34:42 +0000 (17:34 +0000)]

am 1d29bde1: Merge "Avoid sending identity along with EAP sim, aka & aka\'." into mnc-dr-dev

* commit '1d29bde1f5369b5cb5b24adbad662ef33524f4e2':
Avoid sending identity along with EAP sim, aka & aka'.

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Aug 2015 17:17:31 +0000 (17:17 +0000)]

Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Aug 2015 14:18:59 +0000 (14:18 +0000)]

am ce821387: (-s ours) am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Aug 2015 14:11:11 +0000 (14:11 +0000)]

am 699ef29e: (-s ours) am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

* commit '699ef29e9fcf59eb1023c767cceab4de4f64ae13':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Aug 2015 14:06:27 +0000 (14:06 +0000)]

am 42ae7fba: (-s ours) Import translations. DO NOT MERGE

* commit '42ae7fba5b6570cfa36d2132ce30bb23bd91d2e9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Aug 2015 14:00:45 +0000 (07:00 -0700)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Aug 2015 01:42:36 +0000 (18:42 -0700)]

Avoid sending identity along with EAP sim, aka & aka'.

Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:56:36 +0000 (23:56 +0000)]

am f1808dca: am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'f1808dcafc45fea92e27b5300f4d6cc742bb3105':
[ConfirmPattern] use correct user id for stealth mode

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 23:56:35 +0000 (23:56 +0000)]

am 0f440a70: am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '0f440a701cc32fab7a522fe677ee4c280ca648f8':
Fix issue #23079119: Description for write settings permission says...

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:48:50 +0000 (23:48 +0000)]

am e5d64684: am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'e5d646841d62484939c660e078c712866c64f244':
[ConfirmPattern] use correct user id for stealth mode

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 23:48:49 +0000 (23:48 +0000)]

am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
Fix issue #23079119: Description for write settings permission says...

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:43:51 +0000 (23:43 +0000)]

am a7bdde58: am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit 'a7bdde58856c7cf776cb326b7a1a9c58d649b3f8':
[ConfirmPattern] use correct user id for stealth mode

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 23:39:23 +0000 (23:39 +0000)]

am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
Fix issue #23079119: Description for write settings permission says...

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:35:59 +0000 (23:35 +0000)]

am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode

commit | commitdiff | tree

Maurice Lam [Tue, 11 Aug 2015 23:32:26 +0000 (23:32 +0000)]

am d2174636: am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit 'd2174636293e52d4df01f191787df62e96e994d3':
[Fingerprint] Use different ring size for setup

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:31:23 +0000 (23:31 +0000)]

Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev

commit | commitdiff | tree

Maurice Lam [Tue, 11 Aug 2015 23:27:00 +0000 (23:27 +0000)]

am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
[Fingerprint] Use different ring size for setup

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 23:26:45 +0000 (23:26 +0000)]

am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
Fix issue #23079119: Description for write settings permission says...

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 23:17:24 +0000 (23:17 +0000)]

Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev

commit | commitdiff | tree

Andres Morales [Tue, 11 Aug 2015 23:12:50 +0000 (16:12 -0700)]

[ConfirmPattern] use correct user id for stealth mode

Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd

commit | commitdiff | tree

Maurice Lam [Tue, 11 Aug 2015 23:15:33 +0000 (23:15 +0000)]

am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56':
[Fingerprint] Use different ring size for setup

commit | commitdiff | tree

Paul Lawrence [Tue, 11 Aug 2015 23:03:18 +0000 (23:03 +0000)]

am a66240fd: am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit 'a66240fd94cb458cb1e938419abad676b8132ca5':
Gray out confirm button on pattern/pin/password set dialog

commit | commitdiff | tree

Maurice Lam [Tue, 11 Aug 2015 22:43:35 +0000 (22:43 +0000)]

am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
[Fingerprint] Use different ring size for setup

commit | commitdiff | tree

Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]

Merge "[Fingerprint] Use different ring size for setup" into mnc-dev

commit | commitdiff | tree

Paul Lawrence [Tue, 11 Aug 2015 22:35:26 +0000 (22:35 +0000)]

am 550f66ed: am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '550f66edfe5ebafde3afc3ba3fd7e4160373df36':
Gray out confirm button on pattern/pin/password set dialog

commit | commitdiff | tree

Paul Lawrence [Tue, 11 Aug 2015 22:25:31 +0000 (22:25 +0000)]

am 68f79718: Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

* commit '68f79718f7c4f648533e1ecd7f66d0b30f161b64':
Gray out confirm button on pattern/pin/password set dialog

commit | commitdiff | tree

Paul Lawrence [Tue, 11 Aug 2015 22:20:53 +0000 (22:20 +0000)]

Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev

commit | commitdiff | tree

Paul Lawrence [Mon, 3 Aug 2015 16:44:23 +0000 (09:44 -0700)]

Gray out confirm button on pattern/pin/password set dialog

Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.

Note that this requires async tasks so that the button is shown as gray
in a timely way.

Also don't add another stage - this causes a11y to repeat the title.

Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2

commit | commitdiff | tree

Dianne Hackborn [Tue, 11 Aug 2015 19:17:59 +0000 (12:17 -0700)]

Fix issue #23079119: Description for write settings permission says...

...it is for read and write

Just write.

And let's say, modify.

Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e

commit | commitdiff | tree

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