Commit Graph

19058 Commits

Author SHA1 Message Date
Andrew Sapperstein
d4d55b73ad Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
am: 6eafaf46aa

Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
2017-08-09 13:26:31 +00:00
TreeHugger Robot
e286c0627b Merge "Use colorful +s" into oc-mr1-dev 2017-08-09 13:25:48 +00:00
Andrew Sapperstein
6eafaf46aa Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am: 64b15c4a7b

Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
2017-08-09 13:06:33 +00:00
Adrian Roos
6600ddec73 FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes: 63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
2017-08-09 11:08:13 +00:00
Ruchi Kandoi
3b012860db Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev
am: 9eff3f90d8

Change-Id: I6b27975aa51356f31c2a31c8ee04abc7bb84f2b2
2017-08-09 05:38:23 +00:00
Ruchi Kandoi
9eff3f90d8 Merge "Avoid Race condition with accessibility for NFC toggle switch" into oc-dr1-dev 2017-08-09 05:29:12 +00:00
Matthew Fritze
7c1825aa64 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I7396107e4ed06982c8cd300912ce1f4e3c63df4c
Merged-In: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-09 02:06:42 +00:00
Matthew Fritze
c6211c8829 Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
2017-08-08 19:03:43 -07:00
Salvador Martinez
3781030b94 Merge "Update availability for mobile network" into oc-dr1-dev
am: 4bcc3eb193

Change-Id: I1f99651b28ba8576769d0efdb1283c4f6da46695
2017-08-09 01:20:24 +00:00
TreeHugger Robot
4bcc3eb193 Merge "Update availability for mobile network" into oc-dr1-dev 2017-08-09 01:06:50 +00:00
Maurice Lam
aed6b7bd76 Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d am: 6b5f99bcbd
am: b2aa7e7da0

Change-Id: Ia51c480090bc796e8844ac6af04c0b994751603b
2017-08-09 00:47:01 +00:00
Fan Zhang
816efc02fc Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes: 64466310
Test: robotests
2017-08-08 17:38:28 -07:00
Daniel Nishi
f89327aa88 Expose the notification-swipe controls.
Bug: 62022517
Test: Settings robotest
Change-Id: I41368a9e03f38052bb47d04f6b98d56808d07e48
2017-08-08 17:30:38 -07:00
Andrew Sapperstein
92592b4c25 Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am: 64b15c4a7b

Change-Id: I3d17c1389486b7a4d1fe901a69ffa37f1cf16b78
2017-08-09 00:20:03 +00:00
Maurice Lam
b2aa7e7da0 Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
am: 6b5f99bcbd

Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
2017-08-09 00:02:12 +00:00
TreeHugger Robot
64b15c4a7b Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev 2017-08-08 23:59:50 +00:00
Maurice Lam
6b5f99bcbd Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
am: d415cbfc0d

Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
2017-08-08 23:26:20 +00:00
Eric Schwarzenbach
69fa528074 Fix issue where connected network sometimes doesn't update.
Ensures that the connected network Preference and WifiTracker have the
same reference so that updates to one propagate to the other.

Bug: 64124982
Test: manual
Change-Id: I1b838b1cf65da1b5aebf4f5f37f0df0c5e473dba
2017-08-08 16:08:19 -07:00
Fan Zhang
623faaa00e Close cursor after getting data from DB
Fixes: 64487360
Test: manual

Change-Id: I7d8a7550dca272a62b2c664cc893e4319e628c18
2017-08-08 16:03:55 -07:00
Maurice Lam
dbfde54fb6 Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef

Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
2017-08-08 22:56:38 +00:00
Fan Zhang
1228a6af18 Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev am: fef5f6aa4a
am: b5989fc3b7

Change-Id: I189c0936ca9c96d1a686d33bc7da729f6a17d55b
2017-08-08 22:53:23 +00:00
Fan Zhang
b5989fc3b7 Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am: fef5f6aa4a

Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
2017-08-08 22:28:07 +00:00
TreeHugger Robot
fef5f6aa4a Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev 2017-08-08 22:13:13 +00:00
Salvador Martinez
4c2fc34707 Refactor tether logic for reuse
am: 135619d483

Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
2017-08-08 22:08:50 +00:00
Salvador Martinez
fe7c35803e Update availability for mobile network
This CL updates the availability to behave properly when a
user other than the primary user is accessing it. This also
makes the api return no intent if they don't have permission to
access this because attempting to go to that screen will cause a
crash. Also updates tests related to this change.

Test: robotests still pass
Bug: 64092292
Change-Id: If9913d9ae08ee3e205ff324aaeeadc755ff1d23d
2017-08-08 15:04:04 -07:00
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

Change-Id: Ifa0cea7bd7f002359924d0cb3385b867557402c6
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

Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
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

Change-Id: I5bb7958452aa24c1b75dfb63b4a5a86a3c7373cc
2017-08-08 19:06:03 +00:00
Salvador Martinez
401156da7d Merge "Refactor tether logic for reuse" into oc-mr1-dev
am: 705a9e7e85

Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
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

Change-Id: I99e0d6509d49cf31aa17b9e340bd985ec574531b
2017-08-08 03:21:29 +00:00
Salvador Martinez
0d337881ad Refactor permissions code for bluetooth controller enabler am: a8db5ccea8
am: b32159f242

Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
2017-08-08 03:07:08 +00:00
Salvador Martinez
b1c0e38284 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
2017-08-08 03:04:45 +00:00
Salvador Martinez
b32159f242 Refactor permissions code for bluetooth controller enabler
am: a8db5ccea8

Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
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

Change-Id: Ie746547b215648d9f9f7393602594dbde3200b23
2017-08-07 23:12:15 +00:00
Philip P. Moltmann
03cb6098b2 Merge "Revoke invidivual permissions" into oc-mr1-dev
am: 62b6b4d292

Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
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

Change-Id: I71253285d1350418a77dd39a94403a18efbb896d
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

Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
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