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
31fe3b90c9
am cef52a74: am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
...
* commit 'cef52a745a9ebb62f27fc6ecb8c24947b7916e4f':
Hide show/hide system from battery optimizations list
2015-08-05 20:59:42 +00: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
Ajay Panicker
54fc9a4a01
am 21eff785: am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit '21eff785a77c907724a9d44c06ff5c4c66204f3b':
Implement Bluetooth settings factory reset (5/5)
2015-08-05 20:36:11 +00:00
Jason Monk
aceedc73ae
am 888673bd: Hide show/hide system from battery optimizations list
...
* commit '888673bd51acf9263163acfebdd0680358deabaa':
Hide show/hide system from battery optimizations list
2015-08-05 20:31:58 +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
Sanket Padawe
5f9d15ed25
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
Check for special char when renaming device for Wi-Fi direct.
2015-08-05 18:28:12 +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
8c0139b1c8
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:00:54 +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
852d58b924
am ca26f032: am 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit 'ca26f0327c97cb799b4b1348b20424f6a5227d08':
Remove summaries fro configure apps page
2015-08-05 17:32:41 +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
12c70b7c77
am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
Remove summaries fro configure apps page
2015-08-05 14:39:34 +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
b3e81e1004
am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 21:10:14 +00: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
Jason Monk
9824c5da1e
resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04:00
Nick Kralevich
8a85dcc9b4
am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
...
* commit '1adca55ffe10f1741e5fb75bf0e7530ca200d712':
UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
2015-08-04 19:52:44 +00:00
Nick Kralevich
1adca55ffe
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
2015-08-04 19:45:58 +00:00
Jason Monk
c5291b87b3
Remove summaries fro configure apps page
...
Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e
2015-08-04 15:25:32 -04:00
Jason Monk
5d402d59bc
am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
Update USB dialog for USB-C power option
2015-08-04 18:23:57 +00:00
Jason Monk
9390333c84
am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit 'd2af08595073f92eb54d6c08f6d896309b5270d9':
Update USB dialog for USB-C power option
2015-08-04 18:14:38 +00:00
Jason Monk
661d1b7788
am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
...
* commit '2e3775b9b143311da66b91c6f1291a4639236d07':
Update USB dialog for USB-C power option
2015-08-04 17:57:14 +00:00
Jason Monk
2e3775b9b1
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
2015-08-04 17:44:00 +00:00
Jason Monk
d30e426976
Add setting to disable camera gesture
...
Bug: 22183841
Change-Id: I6ada3d2c911fd52e2821f12f3db5d549879941f4
2015-08-04 11:30:50 -04:00
Jason Monk
4137396ac3
am a4152146: am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'a41521465e88a2c29d6e41b735ed4593c3531c8c':
Make sure accessibility service desc isn't clickable
2015-08-04 14:26:43 +00:00
Jason Monk
a41521465e
am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit '92f7b48eb78dd4723cf3d65c163da9498e7ad936':
Make sure accessibility service desc isn't clickable
2015-08-04 14:20:41 +00:00
Jason Monk
7bed7f0443
am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
Make sure accessibility service desc isn't clickable
2015-08-04 14:04:19 +00:00
Jason Monk
25adfb004d
am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
Make sure accessibility service desc isn't clickable
2015-08-04 13:55:14 +00:00
Jason Monk
f61ead7ad6
Make sure accessibility service desc isn't clickable
...
Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9
2015-08-04 09:44:10 -04:00
Jason Monk
83290eef8c
Update USB dialog for USB-C power option
...
Also includes a bit of visual updates, options now have summaries
as well.
Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.
Currently devices don't have USB-C ports, they can be simulated
with the following commands:
$ adb shell dumpsys usb add-port "matrix" dual
# ?s control whether these can be changed
$ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
# Do testing here
$ adb shell dumpsys usb disconnect-port "matrix"
$ adb shell dumpsys usb remove-port "matrix"
$ adb shell dumpsys usb reset
# Use the help for more info
$ adb shell dumpsys usb -h
Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74
2015-08-04 09:18:57 -04:00
Dianne Hackborn
a3903ad006
am bd3119cc: am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'bd3119ccb443a53362cb5325854aa2392b0c043e':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 04:55:10 +00:00
Chris Tate
57c4ddcb15
am 1cc416b8: am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '1cc416b8a4bf64d13a07a69a263e6d41f84f3f80':
Explain properly when apps can open multiple hosts' links
2015-08-04 04:55:09 +00:00
Dianne Hackborn
50cb6411fa
am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 03:10:35 +00:00
Chris Tate
5977cfdf91
am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '6e64e22ec72ac3adfb530f57925e1d4fe1c332dc':
Explain properly when apps can open multiple hosts' links
2015-08-04 03:10:34 +00:00
Prem Kumar
0694de9397
am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'eed361bbafc079adb2a33eccee2f0a71d872ad54':
Allow Contact sharing by default while connecting Car Kit.
2015-08-04 03:10:26 +00:00
Maurice Lam
01495108f1
am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '87fadbe6d96e482fa8fc94f502afa10a522285a4':
[Fingerprint] Help text for backup screen lock
2015-08-04 03:10:07 +00:00
Dianne Hackborn
bd3119ccb4
am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit '437c0d2547b089f413a04a0e414ff7cf6c251def':
Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs
2015-08-04 01:37:50 +00:00