Jason Monk
31227bfaf1
am bce29c8a
: am 746886c5
: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
Add setting to disable camera gesture
2015-08-11 14:08:02 +00:00
Jason Monk
bce29c8a01
am 746886c5
: Merge "Add setting to disable camera gesture" into mnc-dr-dev
...
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
Add setting to disable camera gesture
2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a
Merge "Add setting to disable camera gesture" into mnc-dr-dev
2015-08-11 13:55:54 +00:00
Dianne Hackborn
0583f297f8
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
2015-08-11 00:42:51 +00:00
Dianne Hackborn
b98206c99e
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
2015-08-11 00:35:12 +00:00
Dianne Hackborn
c7fbbf0d7c
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
2015-08-11 00:33:41 +00:00
Dianne Hackborn
01cfaadeeb
am e9bcef35
: am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'e9bcef3541435c1e1a2716d48eb1c1c897841880':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:28:17 +00:00
Dianne Hackborn
c262c522ae
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
2015-08-11 00:27:06 +00:00
Dianne Hackborn
e9bcef3541
am be4df036
: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit 'be4df036e1c688a1b7a5fc9d4ab18f09729296b3':
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
2015-08-11 00:19:40 +00:00
Dianne Hackborn
6fcacc4127
am fc7633ca
: am ba38155d
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-11 00:19:07 +00:00
Dianne Hackborn
fc7633cae2
am ba38155d
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-11 00:11:09 +00:00
Dianne Hackborn
be4df036e1
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
2015-08-10 17:07:14 -07:00
Dianne Hackborn
ba38155d25
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-11 00:06:43 +00:00
Dianne Hackborn
9bedd25c77
Fix issue #23037720 : New Battery Optimization Strings
...
No, really, these are the strings.
Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
2015-08-10 17:03:38 -07:00
Dianne Hackborn
d638185db9
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
2015-08-10 22:21:22 +00:00
Dianne Hackborn
6ae019e74b
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
2015-08-10 22:15:13 +00:00
Dianne Hackborn
cbfb4c4bff
am fa8a85da
: am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'fa8a85da05a9deea9b1ae249a490b63e46058eff':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:07:13 +00:00
Dianne Hackborn
fa8a85da05
am 996e285c
: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '996e285cdcd26ee7251ec80915eeed57541efb6d':
Fix issue #23037720 : New Battery Optimization Strings
2015-08-10 22:02:23 +00:00
Dianne Hackborn
996e285cdc
Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
2015-08-10 21:55:23 +00:00
Julia Reynolds
0b514bdd21
am 415d6a24
: am f47896d2
: am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '415d6a2411edfd72764bfd82208eff6020d85add':
Wrap text on long preferences.
2015-08-10 20:59:29 +00:00
Julia Reynolds
415d6a2411
am f47896d2
: am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit 'f47896d223c715a6f480a0c7be36fc1206caf404':
Wrap text on long preferences.
2015-08-10 20:53:31 +00:00
Julia Reynolds
f47896d223
am 77dc56bc
: am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '77dc56bc4ce29016820dc90fea933324dc57f4be':
Wrap text on long preferences.
2015-08-10 20:45:56 +00:00
Julia Reynolds
77dc56bc4c
am 2557d8a2
: Merge "Wrap text on long preferences." into mnc-dev
...
* commit '2557d8a25124b93801bc5de1b1b2d063cad1c3ff':
Wrap text on long preferences.
2015-08-10 20:37:34 +00:00
Jason Monk
d1cecdd33e
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
2015-08-10 20:34:04 +00:00
Julia Reynolds
2557d8a251
Merge "Wrap text on long preferences." into mnc-dev
2015-08-10 20:32:49 +00:00
Jason Monk
55511dab4f
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
2015-08-10 20:30:11 +00:00
Jason Monk
9614b50319
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
2015-08-10 20:21:53 +00:00
Jason Monk
a1f64bf207
am cf1e22f4
: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit 'cf1e22f4471f39f4cf3c134006ecf9ffedb91e36':
Remove extra help & feedback menu from power usage
2015-08-10 20:14:46 +00:00
Jason Monk
cf1e22f447
Merge "Remove extra help & feedback menu from power usage" into mnc-dev
2015-08-10 20:09:20 +00:00
Jason Monk
3006c377c2
Remove extra help & feedback menu from power usage
...
Bug: 23044354
Change-Id: Ic722655a50eddbf4f8e53a2b73ed49b5cf6426a4
2015-08-10 15:58:09 -04:00
Pavel Zhamaitsiak
10278acc8b
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
2015-08-10 17:58:10 +00:00
Pavel Zhamaitsiak
7381ed0d9b
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
2015-08-10 17:51:31 +00:00
Pavel Zhamaitsiak
05c4a75701
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
2015-08-10 17:41:22 +00:00
Pavel Zhamaitsiak
f48424e17c
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
2015-08-10 17:35:16 +00:00
Pavel Zhamaitsiak
8cf5426499
Merge "Ensure that listener is removed only if it was added" into mnc-dev
2015-08-10 17:29:38 +00:00
Geoff Mendal
c30ada16af
am d0aa60ed
: (-s ours) am 23127a61
: (-s ours) am 41abf663
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd0aa60ed8bc6ad33ac3bfea3006319f10f3e5ab8':
Import translations. DO NOT MERGE
2015-08-10 14:26:55 +00:00
Geoff Mendal
d0aa60ed8b
am 23127a61
: (-s ours) am 41abf663
: (-s ours) Import translations. DO NOT MERGE
...
* commit '23127a6123ed72451185ff5cdaa02b3c617cafe7':
Import translations. DO NOT MERGE
2015-08-10 14:20:54 +00:00
Geoff Mendal
23127a6123
am 41abf663
: (-s ours) Import translations. DO NOT MERGE
...
* commit '41abf66362ccf9f75dc67142b48d0f31c13f1d3d':
Import translations. DO NOT MERGE
2015-08-10 14:12:22 +00:00
Geoff Mendal
41abf66362
Import translations. DO NOT MERGE
...
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
2015-08-10 07:03:46 -07:00
Geoff Mendal
c34f7fc772
am 40a54fd8
: (-s ours) am c064ecdf
: (-s ours) am 3ca58bbd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '40a54fd8081ee2908aefeffafb71b84ea2b067e8':
Import translations. DO NOT MERGE
2015-08-08 14:53:06 +00:00
Geoff Mendal
40a54fd808
am c064ecdf
: (-s ours) am 3ca58bbd
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c064ecdf79ec1c4651f77e1ffcd1c3143f7b47ed':
Import translations. DO NOT MERGE
2015-08-08 14:45:45 +00:00
Geoff Mendal
c064ecdf79
am 3ca58bbd
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3ca58bbda3d1daacc6750a1502a775641b2d0961':
Import translations. DO NOT MERGE
2015-08-08 14:36:30 +00:00
Geoff Mendal
3ca58bbda3
Import translations. DO NOT MERGE
...
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
2015-08-08 07:26:58 -07:00
Jeff Sharkey
737213fc87
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.
2015-08-08 00:13:16 +00:00
Jeff Sharkey
0f4465a4cd
am 11088b81
: am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '11088b815b030114b14f8a3e7d81d9238c2d51b8':
Block moving when already in progress.
2015-08-08 00:06:40 +00:00
Jeff Sharkey
11088b815b
am cb0c0718
: am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit 'cb0c07181a77ef134310c0e037345f33e7a46d9e':
Block moving when already in progress.
2015-08-07 23:58:46 +00:00
Jeff Sharkey
cb0c07181a
am 67f0739c
: Merge "Block moving when already in progress." into mnc-dev
...
* commit '67f0739ca3a81515975856b09d216debfd090ae9':
Block moving when already in progress.
2015-08-07 23:51:57 +00:00
Jeff Sharkey
67f0739ca3
Merge "Block moving when already in progress." into mnc-dev
2015-08-07 23:38:44 +00:00
Jeff Sharkey
16634fd0ff
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
2015-08-07 15:59:28 -07:00
Billy Lau
c2012bb479
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
2015-08-07 22:42:55 +00:00