OSDN Git Service
Jeff Sharkey [Fri, 14 Aug 2015 18:40:03 +0000 (18:40 +0000)]
am
b0f9e9d4: am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b0f9e9d49fb9cf0c4ffada36dc129b7899f16ffb':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:34:36 +0000 (18:34 +0000)]
am
82fee7bd: am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
82fee7bd0a82a48e204bcaf5480701b36c857276':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:29:15 +0000 (18:29 +0000)]
am
b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
* commit '
b4158f0e15bdc55de40a4e5f5a17c9e4a6325b61':
Only offer migration between private volumes.
Jeff Sharkey [Fri, 14 Aug 2015 18:23:39 +0000 (18:23 +0000)]
Merge "Only offer migration between private volumes." into mnc-dev
Chris Tate [Fri, 14 Aug 2015 17:35:13 +0000 (17:35 +0000)]
am
7c8cb46f: am
36e2d32d: am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7c8cb46fe383956830a04e079a13ded56f7c2154':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:27:02 +0000 (17:27 +0000)]
am
36e2d32d: am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
36e2d32dab47f9d46c0234202c2a799c43b67c9e':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:20:18 +0000 (17:20 +0000)]
am
7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
* commit '
7e36d33c00458a5f74b69963723c6e06f3f6ccf3':
Make "Ask every time" actually work that way
Chris Tate [Fri, 14 Aug 2015 17:11:48 +0000 (17:11 +0000)]
Merge "Make "Ask every time" actually work that way" into mnc-dev
Jeff Sharkey [Fri, 14 Aug 2015 16:46:03 +0000 (09:46 -0700)]
Only offer migration between private volumes.
Without this change, there is a confusing option to migrate a public
SD card volume to internal storage, which will always fail if the
user picks it, since it's not supported under the hood.
Bug:
22966671
Change-Id: Id7cad07eea6583aace398a6d64383bf7d884ae9e
Jeff Sharkey [Fri, 14 Aug 2015 01:37:59 +0000 (01:37 +0000)]
am
fa620435: am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
fa62043590d5ae99008aa1ddbd1e8b1f052fc0a1':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:31:27 +0000 (01:31 +0000)]
am
c73287b9: am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
c73287b9dbfe63ddde24ac1e0975f50382f24e71':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:24:41 +0000 (01:24 +0000)]
am
ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
* commit '
ae531f1f613fb1a94fade18e5e92fc842a2a9016':
Show storage slow dialog allowing state loss.
Jeff Sharkey [Fri, 14 Aug 2015 01:18:18 +0000 (01:18 +0000)]
Merge "Show storage slow dialog allowing state loss." into mnc-dev
Jeff Sharkey [Thu, 13 Aug 2015 23:57:46 +0000 (16:57 -0700)]
Show storage slow dialog allowing state loss.
We're not picky about losing state here, since the adoption actually
finished under the hood and we're just warning the user that it's
slow.
Without this change, we could end up throwing and re-adopting the
same device twice, which causes issues on sprout-style devices that
only migrate primary storage once.
Bug:
22867250
Change-Id: I1491679ab802f19fe25b82e9b452ca3dabdfec0d
Christopher Tate [Thu, 13 Aug 2015 23:34:10 +0000 (16:34 -0700)]
Make "Ask every time" actually work that way
..in link-opening behavior. If a candidate is marked as "ask
every time," then the user is guaranteed to get a disambiguation
prompt including that candidate even when some other candidate
app is in the "always prefer this over a browser" state.
Bug
23147746
Change-Id: I73d8893ab74ea0356b757ab836349243cda2e307
Geoff Mendal [Thu, 13 Aug 2015 05:09:45 +0000 (05:09 +0000)]
am
93d1612d: (-s ours) am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
93d1612d160f3e71c6dead490a36a334f6abb25f':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 05:04:41 +0000 (05:04 +0000)]
am
8a12d17b: (-s ours) am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
8a12d17b09281f09adaf6685680f7cb991aef049':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:59:17 +0000 (04:59 +0000)]
am
eea96f22: (-s ours) Import translations. DO NOT MERGE
* commit '
eea96f22a1ec156d78374f49352341c46c219ca0':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 13 Aug 2015 04:50:09 +0000 (21:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
Jorim Jaggi [Thu, 13 Aug 2015 01:35:51 +0000 (01:35 +0000)]
am
e9639b1d: am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
e9639b1d0141ce25548105a17eab3e30b6341f1a':
Wait with finishing until fingerprints are removed
Jorim Jaggi [Thu, 13 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
5dd0e27f: Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
* commit '
5dd0e27fbbc8207ca9c8e05e60cf8f9ea5c0c88a':
Wait with finishing until fingerprints are removed
Jorim Jaggi [Thu, 13 Aug 2015 01:18:03 +0000 (01:18 +0000)]
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
Jorim Jaggi [Tue, 11 Aug 2015 01:11:07 +0000 (18:11 -0700)]
Wait with finishing until fingerprints are removed
Bug:
22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
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
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
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
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
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
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'.
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'.
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
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
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
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
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
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
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...
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
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...
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
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
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
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...
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
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
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
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
Maurice Lam [Tue, 11 Aug 2015 22:35:53 +0000 (22:35 +0000)]
Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
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
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
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
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
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
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
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
Jason Monk [Tue, 11 Aug 2015 13:55:54 +0000 (13:55 +0000)]
Merge "Add setting to disable camera gesture" into mnc-dr-dev
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
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
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
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
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
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
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
Dianne Hackborn [Tue, 11 Aug 2015 00:06:43 +0000 (00:06 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
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
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
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
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
Dianne Hackborn [Mon, 10 Aug 2015 21:55:23 +0000 (21:55 +0000)]
Merge "Fix issue #
23037720: New Battery Optimization Strings" into mnc-dev
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.
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.
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.
Julia Reynolds [Mon, 10 Aug 2015 20:32:49 +0000 (20:32 +0000)]
Merge "Wrap text on long preferences." into mnc-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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.
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.
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.
Jeff Sharkey [Fri, 7 Aug 2015 23:38:44 +0000 (23:38 +0000)]
Merge "Block moving when already in progress." into mnc-dev
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
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
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
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
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
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
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
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