Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,238 Commits 1 Branch 0 Tags
0b514bdd219e28cb1c920265fe36c1c30a6c8d5c
Commit Graph

9241 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Andres Morales
7bdffd85eb fix CC for work profiles 
Bug: 22257554
Change-Id: I09f62956d01f91d3014d9fa250aaff68ab5e1a9b
 2015-08-05 19:57:51 -07:00
Jason Monk
cef52a745a am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list 
* commit '854533a82d5cfeac27e80b610544291c5be4fa39':
  Hide show/hide system from battery optimizations list
 2015-08-05 20:52:19 +00:00
Jason Monk
5b12cb7712 am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list 
* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
  Hide show/hide system from battery optimizations list
 2015-08-05 20:37:17 +00:00
Jason Monk
150e60ca9a am 888673bd: Hide show/hide system from battery optimizations list 
* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list
 2015-08-05 20:30:40 +00:00
Jason Monk
888673bd51 Hide show/hide system from battery optimizations list 
Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc
 2015-08-05 16:08:00 -04:00
Ajay Panicker
21eff785a7 am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 
* commit 'e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
  Implement Bluetooth settings factory reset (5/5)
 2015-08-05 18:43:17 +00:00
Ajay Panicker
f1ffec39b6 am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 
* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
  Implement Bluetooth settings factory reset (5/5)
 2015-08-05 18:16:29 +00:00
Ajay Panicker
1dd985abdc am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 
* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
  Implement Bluetooth settings factory reset (5/5)
 2015-08-05 18:01:14 +00:00
Ajay Panicker
cd8acb2256 Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev 2015-08-05 17:49:08 +00:00
Jason Monk
ca26f0327c am 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev 
* commit '4734d829cd72acc70f24af88a3780c29d410af2d':
  Remove summaries fro configure apps page
 2015-08-05 17:26:03 +00:00
Jason Monk
6be055a83d am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev 
* commit 'c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
  Remove summaries fro configure apps page
 2015-08-05 17:01:02 +00:00
Jason Monk
c86f6dfdc8 am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev 
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
  Remove summaries fro configure apps page
 2015-08-05 16:48:13 +00:00
Jason Monk
244fd78205 Merge "Remove summaries fro configure apps page" into mnc-dev 2015-08-05 14:34:14 +00:00
Billy Lau
3d9c7fc998 Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS 
Change the implementation of AppStateAppOpsBridge to handle multiple
requested permissions in one operation due to the merging of
CHANGE_NETWORK_STATE permission with WRITE_SETTINGS.

This change will affect the packages that will be listed under the
"Write system settings" option in Settings->Apps->[Gear/Cog].

Change-Id: I7d2304d2846b6f505a7b1c3fcf53e7a9bd184ed5
 2015-08-04 23:44:36 +01:00
Ajay Panicker
568d9336ba Implement Bluetooth settings factory reset (5/5) 
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b
 2015-08-04 15:28:16 -07:00
Jason Monk
183fcd5370 am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev 
* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
 2015-08-04 21:03:38 +00:00
Jason Monk
bd776a0bb7 am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev 
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
 2015-08-04 20:43:01 +00:00