Commit Graph

21124 Commits

Author SHA1 Message Date
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
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
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
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
Julia Reynolds
2557d8a251 Merge "Wrap text on long preferences." into mnc-dev 2015-08-10 20:32:49 +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
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
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
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
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
8c26cbd87e 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
2015-08-07 22:28:38 +00:00
Billy Lau
5b2c66e4da 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
2015-08-07 22:22:19 +00:00
Billy Lau
a59f39fca6 Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev 2015-08-07 22:15:32 +00:00
Dianne Hackborn
1ded441390 am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:12:58 +00:00
Dianne Hackborn
7a3a453349 am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings
2015-08-07 22:05:56 +00:00
Dianne Hackborn
e7a5966aa7 Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 2015-08-07 21:58:52 +00:00
Dianne Hackborn
f5497aa93c Fix issue #23037720: New Battery Optimization Strings
Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
2015-08-07 14:43:55 -07:00
Dianne Hackborn
a1e572c528 Fix issue #23037720: New Battery Optimization Strings
There be strings.

Change-Id: I92d4bd64f36f7d186a383178d55fbff26078509c
2015-08-07 14:38:58 -07:00
Pavel Zhamaitsiak
2fe4b3cb9e Ensure that listener is removed only if it was added
Bug: 23016088
Change-Id: Ia6f17739ffc841ce8483e9c6c8132a94ecd62200
2015-08-07 12:02:38 -07:00
Julia Reynolds
e113f0c487 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.
2015-08-07 16:45:04 +00:00
Julia Reynolds
b7028f254d 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.
2015-08-07 16:34:58 +00:00
Julia Reynolds
5ab0e183ab Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev 2015-08-07 16:29:41 +00:00
Geoff Mendal
233f1b61ce am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '6540a97291a5217558e67e5ed4186a25fbd16145':
  Import translations. DO NOT MERGE
2015-08-07 04:48:08 +00:00
Geoff Mendal
6540a97291 am 2d546b77: (-s ours) Import translations. DO NOT MERGE
* commit '2d546b77b997376416e2ba22d5a01ef6da27cbb3':
  Import translations. DO NOT MERGE
2015-08-07 04:44:05 +00:00
Geoff Mendal
2d546b77b9 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
2015-08-07 04:21:22 +00:00
Andres Morales
13d387631f am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit 'd4c3dff6e3f900ab5693c9406ea625c2e398f7ba':
  fix CC for work profiles
2015-08-06 22:36:04 +00:00
Andres Morales
d4c3dff6e3 am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
* commit '4897fa87a55173f45bfddb2480a2e34eb412b8ef':
  fix CC for work profiles
2015-08-06 22:30:55 +00:00
Andres Morales
4897fa87a5 Merge "fix CC for work profiles" into mnc-dev 2015-08-06 22:22:17 +00:00
Julia Reynolds
89a7a88124 Wrap text on long preferences.
Bug: 22987590
Change-Id: Iaef2c7d7d4581372a381d537f6d85a64d94bdf12
2015-08-06 14:23:47 -04:00
Julia Reynolds
2f01c5f5b5 Hide optimization control on battery details page for non whitelisted apps.
Bug: 22978210
Change-Id: If532960478dccf6ef9bea08a27167e1850749277
2015-08-06 11:42:40 -04:00
Geoff Mendal
05facd935a am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE
2015-08-06 04:24:45 +00:00
Geoff Mendal
40f6e9ab3e am 90c22976: (-s ours) Import translations. DO NOT MERGE
* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE
2015-08-06 04:20:45 +00:00