PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,232 Commits 1 Branch 0 Tags
d1cecdd33e7366e5b23dcc7f05078bde0b43c13c
Commit Graph

22232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Billy Lau
16dc289d5b 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
 2015-08-07 22:36:29 +00: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
Dianne Hackborn
81a3ef139b 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
 2015-08-07 22:25:36 +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
Dianne Hackborn
a3e6657658 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
 2015-08-07 22:20:50 +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
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
af3414c2c7 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.
 2015-08-07 16:57:50 +00:00
Julia Reynolds
559a3e7886 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.
 2015-08-07 16:52:11 +00: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
fab5c39af6 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
 2015-08-07 05:02:05 +00:00
Geoff Mendal
75a77cc77d am 233f1b61: (-s ours) am 6540a972: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE 
* commit '233f1b61ce627819adb4351eb0b2d78f3020a38d':
  Import translations. DO NOT MERGE
 2015-08-07 04:55:25 +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
23f40d37fc am ae560bf1: am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev 
* commit 'ae560bf189a7f738d67e87ed78579203b99a0066':
  fix CC for work profiles
 2015-08-06 22:49:32 +00:00
Andres Morales
ae560bf189 am 13d38763: am d4c3dff6: am 4897fa87: Merge "fix CC for work profiles" into mnc-dev 
* commit '13d387631f586d03a77aace9da9a991d5aea32ba':
  fix CC for work profiles
 2015-08-06 22:41:42 +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