Jorim Jaggi
5dd0e27fbb
Merge "Wait with finishing until fingerprints are removed" into mnc-dr-dev
2015-08-13 01:18:03 +00:00
Jorim Jaggi
f92fbc1c49
Wait with finishing until fingerprints are removed
...
Bug: 22863210
Change-Id: I490157cc2f9b52ac87cc52e13c7eb57cb4a4a377
2015-08-12 18:12:58 -07:00
Dianne Hackborn
6a1e1e08a0
am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
Fix issue #23116383 : Include security patch level in Settings
2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0
Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9
Fix issue #23116383 : Include security patch level in Settings
...
Change-Id: I003564376a02a70f0245353472544cde355240ac
2015-08-12 16:11:46 -07:00
Sanket Padawe
1d29bde1f5
Merge "Avoid sending identity along with EAP sim, aka & aka'." into mnc-dr-dev
2015-08-12 17:17:31 +00:00
Sanket Padawe
f1165c14c5
Avoid sending identity along with EAP sim, aka & aka'.
...
Bug: 22358498
Change-Id: I829b3f9fe688efc933483506e1b5944195e1975f
2015-08-11 18:42:36 -07:00
Andres Morales
a7bdde5885
am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '9f879ef009863a0674e891ad0e51b1b216da5beb':
[ConfirmPattern] use correct user id for stealth mode
2015-08-11 23:35:59 +00:00
Andres Morales
b56324b149
[ConfirmPattern] use correct user id for stealth mode
...
Bug: 23027554
Change-Id: I9582dab3a0355f613d0ce1c943b0eeba2694dddd
2015-08-11 23:17:17 +00:00
Paul Lawrence
68f79718f7
Merge "Gray out confirm button on pattern/pin/password set dialog" into mnc-dr-dev
2015-08-11 22:20:53 +00:00
Paul Lawrence
cff37ecbdd
Gray out confirm button on pattern/pin/password set dialog
...
Setting a pin/pattern/password can take a second. Gray out the confirm
button to avoid multiple submissions.
Note that this requires async tasks so that the button is shown as gray
in a timely way.
Also don't add another stage - this causes a11y to repeat the title.
Bug: 22882174
Change-Id: Ib8047fde9e12afa25e82ebfa3a1e799a4b7043f2
2015-08-11 15:17:04 -07: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
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
be4df036e1
Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
New pretty dialog.
Change-Id: I6094b83139beffc407b01049a0d9d1f85a95df07
2015-08-10 17:07:14 -07: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
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
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
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
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
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
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
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
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
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
9824c5da1e
resolved conflicts for merge of 1adca55f to mnc-dr-dev
...
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
2015-08-04 16:23:32 -04: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
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
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
f426126a76
Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
2015-08-04 01:07:36 +00:00