Maurice Lam
5a926705ef
Merge "Show help string when onEnrollmentHelp() is called"
2017-08-08 22:02:20 +00:00
Ruchi Kandoi
1eab553653
Avoid Race condition with accessibility for NFC toggle switch
...
Bug: 64429429
Test: Enable TalkBack; Toggle NFC settings
Change-Id: Iadeae0ca33c32b320c202efc2acf0be647b10078
2017-08-08 20:58:29 +00:00
Andrew Sapperstein
5be6c30012
Refactoring for AmbientAlwaysOnPreferenceController
...
Makes a few methods static so we can call them from other locations.
Bug: 64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
2017-08-08 13:58:18 -07:00
Salvador Martinez
135619d483
Refactor tether logic for reuse
...
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug: 64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-08 12:35:20 -07:00
jackqdyulei
0e117ecc28
Merge "Add uid data even though on battery stats" into oc-mr1-dev am: 189899c169
...
am: 51aac2af9e
2017-08-08 19:31:35 +00:00
jackqdyulei
51aac2af9e
Merge "Add uid data even though on battery stats" into oc-mr1-dev
...
am: 189899c169
2017-08-08 19:28:39 +00:00
TreeHugger Robot
189899c169
Merge "Add uid data even though on battery stats" into oc-mr1-dev
2017-08-08 19:22:50 +00:00
Salvador Martinez
9c6b2fabb5
Merge "Refactor tether logic for reuse" into oc-mr1-dev am: 705a9e7e85
...
am: 401156da7d
2017-08-08 19:06:03 +00:00
Salvador Martinez
401156da7d
Merge "Refactor tether logic for reuse" into oc-mr1-dev
...
am: 705a9e7e85
2017-08-08 19:02:08 +00:00
TreeHugger Robot
705a9e7e85
Merge "Refactor tether logic for reuse" into oc-mr1-dev
2017-08-08 18:53:39 +00:00
Julia Reynolds
fabe766958
Use colorful +s
...
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes: 63820885
Test: manual
2017-08-08 14:00:09 -04:00
Fan Zhang
6d479d99a9
Misc fixes for settings
...
- Set device credential's Window flag to be SECURE. This prevents
showing any pattern/pin in recent list.
- Disable tap sound on entity header
Fixes: 64339515
Fixes: 64413598
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
2017-08-08 10:34:03 -07:00
Salvador Martinez
b1a4db26d8
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8 am: b32159f242
...
am: 0d337881ad
2017-08-08 03:21:29 +00:00
Salvador Martinez
0d337881ad
Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
...
am: b32159f242
2017-08-08 03:07:08 +00:00
Salvador Martinez
b32159f242
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
Salvador Martinez
b1c0e38284
Refactor permissions code for bluetooth controller enabler
...
am: a8db5ccea8
2017-08-08 03:04:45 +00:00
Salvador Martinez
a8db5ccea8
Refactor permissions code for bluetooth controller enabler
...
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug: 62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 17:51:02 -07:00
Salvador Martinez
52da8a79b9
Refactor tether logic for reuse
...
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug: 64092292
Change-Id: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
2017-08-07 23:14:34 +00:00
Philip P. Moltmann
f4978f6512
Merge "Revoke invidivual permissions" into oc-mr1-dev am: 62b6b4d292
...
am: 03cb6098b2
2017-08-07 23:12:15 +00:00
Philip P. Moltmann
03cb6098b2
Merge "Revoke invidivual permissions" into oc-mr1-dev
...
am: 62b6b4d292
2017-08-07 23:06:28 +00:00
TreeHugger Robot
62b6b4d292
Merge "Revoke invidivual permissions" into oc-mr1-dev
2017-08-07 22:58:33 +00:00
jackqdyulei
fe5a771e92
Add uid data even though on battery stats
...
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.
Bug: 64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
2017-08-07 14:38:21 -07:00
Peter Qiu
3881c09e14
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev am: 8d3bfd62e1
...
am: d83df9e371
2017-08-07 20:52:51 +00:00
Peter Qiu
d83df9e371
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
...
am: 8d3bfd62e1
2017-08-07 20:26:23 +00:00
TreeHugger Robot
8d3bfd62e1
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
2017-08-07 20:08:31 +00:00
TreeHugger Robot
2f8c398165
Merge "Move LogPersist to SettingsLib"
2017-08-07 18:50:43 +00:00
Philip P. Moltmann
3e6222a982
Revoke invidivual permissions
...
The permission->group mapping is not guaranteed to be stable.
Bug: 64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
2017-08-07 11:32:33 -07:00
Beverly
90da133162
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev am: 7fc4dd7e7b
...
am: 793e3641c0
2017-08-07 17:27:17 +00:00
Beverly
793e3641c0
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
...
am: 7fc4dd7e7b
2017-08-07 17:21:53 +00:00
TreeHugger Robot
7fc4dd7e7b
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
2017-08-07 17:16:06 +00:00
Peter Qiu
486fc9dca9
wifi: WifiConfigController: fix possible NPE in showSecurityFields
...
Bug: 64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
2017-08-07 10:10:15 -07:00
Matthew Fritze
d1b29a4350
Merge "Expose Location toggling logic" into oc-dr1-dev
...
am: 4f0e5f8395
2017-08-07 17:02:19 +00:00
TreeHugger Robot
4f0e5f8395
Merge "Expose Location toggling logic" into oc-dr1-dev
2017-08-07 16:53:29 +00:00
Matthew Fritze
059295559c
Expose Location toggling logic am: 6593453d59
...
am: 1857058348
2017-08-07 15:17:46 +00:00
Matthew Fritze
1857058348
Expose Location toggling logic
...
am: 6593453d59
2017-08-07 15:15:41 +00:00
Beverly
2aeff818c8
Uninstall app through notif closes app settings.
...
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes: 62051546
Test: manual
2017-08-07 14:21:36 +00:00
Matthew Fritze
6593453d59
Expose Location toggling logic
...
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug: 62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
2017-08-06 14:29:16 -07:00
Matthew Fritze
ef722b029c
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev am: 688e5438dd
...
am: a9dfbcee2b
2017-08-06 20:55:07 +00:00
Matthew Fritze
a9dfbcee2b
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
...
am: 688e5438dd
2017-08-06 20:52:37 +00:00
TreeHugger Robot
688e5438dd
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
2017-08-06 20:46:27 +00:00
Doris Ling
1f39ca8abf
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
...
am: 8f54cd46ff
2017-08-05 05:32:43 +00:00
TreeHugger Robot
8f54cd46ff
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
2017-08-05 05:20:42 +00:00
Meng Wang
8c2cd0d047
RadioInfo: fix OMADM buttons
...
am: d4e0fe7f93
2017-08-05 00:04:43 +00:00
Doris Ling
058d2d10e2
Fix crash when dismissing suggestions.
...
When the suggestions are in default mode and the number of suggestions
are more than the default count, we set the sublist of the suggestions
list as the suggestion adapter data. In this case, operation on the
suggestions list should be done in the sublist instead of the original
list to maintain the list consistency check.
Hence, when dismissing the suggestion, change to remove the suggestion
from the sugestion adapter instead of from the dashboard adapter, so
that any following interaction with the suggestions will not trigger the
concurrent modification exception.
Change-Id: I4caba74cfcc7bd0d53ad8c7dffcb127b3ebd845d
Merged-In: I970b6af8a1c72bc0c3ee89fef890ae6a669c71d2
Fix: 64279080
Test: make RunSettingsRoboTests
2017-08-04 23:44:23 +00:00
pkanwar
74ca5db903
Merge "Add support for carrier wifi in UI." into oc-mr1-dev am: f8f6910d7c
...
am: a0bc09c27d
2017-08-04 22:54:24 +00:00
Fan Zhang
bbe2ac7b2d
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev am: 4c84a61581
...
am: 9d8924bce3
2017-08-04 22:53:49 +00:00
pkanwar
a0bc09c27d
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
...
am: f8f6910d7c
2017-08-04 22:45:36 +00:00
Fan Zhang
9d8924bce3
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
...
am: 4c84a61581
2017-08-04 22:45:08 +00:00
TreeHugger Robot
f8f6910d7c
Merge "Add support for carrier wifi in UI." into oc-mr1-dev
2017-08-04 22:41:13 +00:00
TreeHugger Robot
4c84a61581
Merge "Misc tweak on wifi hotspot setting page" into oc-mr1-dev
2017-08-04 22:36:57 +00:00
