Eric Schwarzenbach
c03105dfb3
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev am: 51bde3c8fe
...
am: 33840ce005
2017-08-10 02:19:36 +00:00
Justin Klaassen
27ef303dd1
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev am: d59854de24
...
am: 6652cfcd7e
2017-08-10 02:19:12 +00:00
TreeHugger Robot
d0b09f7868
Merge "Remove code for old wifi tether feature"
2017-08-10 00:08:03 +00:00
Eric Schwarzenbach
33840ce005
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
...
am: 51bde3c8fe
2017-08-09 20:02:03 +00:00
Justin Klaassen
6652cfcd7e
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
...
am: d59854de24
2017-08-09 20:01:40 +00:00
TreeHugger Robot
51bde3c8fe
Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev
2017-08-09 19:49:41 +00:00
TreeHugger Robot
d59854de24
Merge "Ask device owner for master clear in demo mode" into oc-mr1-dev
2017-08-09 19:40:03 +00:00
Matthew Fritze
e69329cc84
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev am: e0c0616d6f
...
am: f9831dc7be
2017-08-09 18:57:08 +00:00
Matthew Fritze
f9831dc7be
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
...
am: e0c0616d6f
2017-08-09 18:37:19 +00:00
TreeHugger Robot
e0c0616d6f
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
2017-08-09 18:22:21 +00:00
Fan Zhang
b5a5cc251a
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev am: 293899d5ce
...
am: 25f9060ab7
2017-08-09 18:17:29 +00:00
Fan Zhang
471f603ea5
Merge "Misc fixes for settings" into oc-mr1-dev am: 54d816fd90
...
am: e809b806f9
2017-08-09 18:16:57 +00:00
Fan Zhang
25f9060ab7
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
...
am: 293899d5ce
2017-08-09 18:04:15 +00:00
Fan Zhang
e809b806f9
Merge "Misc fixes for settings" into oc-mr1-dev
...
am: 54d816fd90
2017-08-09 18:03:29 +00:00
TreeHugger Robot
293899d5ce
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
2017-08-09 17:53:22 +00:00
TreeHugger Robot
54d816fd90
Merge "Misc fixes for settings" into oc-mr1-dev
2017-08-09 17:52:49 +00:00
Justin Klaassen
3025727e16
Ask device owner for master clear in demo mode
...
Bug: 62712426
Test: make RunSettingsRoboTests -j19
Change-Id: I29f92ff1062590f2c5eb7713e5969da7870fc582
2017-08-09 10:44:19 -07:00
Adrian Roos
d3c5da9e18
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am: a147d4a616
...
am: 1d192addc6
2017-08-09 14:18:21 +00:00
Julia Reynolds
cad51d7753
Merge "Use colorful +s" into oc-mr1-dev am: e286c0627b
...
am: 5d17c4284d
2017-08-09 14:17:57 +00:00
Adrian Roos
1d192addc6
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
...
am: a147d4a616
2017-08-09 13:55:00 +00:00
Julia Reynolds
5d17c4284d
Merge "Use colorful +s" into oc-mr1-dev
...
am: e286c0627b
2017-08-09 13:54:40 +00:00
Andrew Sapperstein
5a53f22c02
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b am: 6eafaf46aa
...
am: d4d55b73ad
2017-08-09 13:43:06 +00:00
TreeHugger Robot
a147d4a616
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
2017-08-09 13:36:40 +00:00
Andrew Sapperstein
d4d55b73ad
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am: 64b15c4a7b
...
am: 6eafaf46aa
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
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
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
Maurice Lam
aed6b7bd76
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d am: 6b5f99bcbd
...
am: b2aa7e7da0
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
Maurice Lam
b2aa7e7da0
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
...
am: 6b5f99bcbd
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
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
Maurice Lam
dbfde54fb6
Merge "Show help string when onEnrollmentHelp() is called"
...
am: 5a926705ef
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
2017-08-08 22:53:23 +00:00
Fan Zhang
b5989fc3b7
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
...
am: fef5f6aa4a
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
2017-08-08 22:08:50 +00:00
Maurice Lam
5a926705ef
Merge "Show help string when onEnrollmentHelp() is called"
2017-08-08 22:02:20 +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
