Fan Zhang
0a07b19dd9
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev am: dad9b79630
...
am: b1ff93dfeb
2017-09-06 22:53:14 +00:00
Fan Zhang
b1ff93dfeb
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
...
am: dad9b79630
2017-09-06 21:22:14 +00:00
TreeHugger Robot
418976552c
Merge "Create owner file for development package"
2017-09-06 21:17:15 +00:00
TreeHugger Robot
dad9b79630
Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev
2017-09-06 19:53:39 +00:00
TreeHugger Robot
7f541b8227
Merge "Clean up test strings"
2017-09-06 19:49:36 +00:00
Bill Yi
ea080fbf34
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 14a359a550 -s ours
...
am: 25012afc7f
2017-09-06 19:19:25 +00:00
Bill Yi
25012afc7f
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 14a359a550
2017-09-06 18:56:13 +00:00
Bill Yi
2b037d3e8a
Import translations. DO NOT MERGE am: 535dd7f066 -s ours am: 363626edcf -s ours
...
am: f8f6cb368d
2017-09-06 18:43:28 +00:00
Julia Reynolds
97942ca832
Merge "Properly show/hide advanced settings" into oc-mr1-dev am: 12c9d6d65a
...
am: fa3fa3483e
2017-09-06 18:42:36 +00:00
TreeHugger Robot
14a359a550
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-09-06 18:40:23 +00:00
Bill Yi
f8f6cb368d
Import translations. DO NOT MERGE am: 535dd7f066 -s ours
...
am: 363626edcf
2017-09-06 18:40:07 +00:00
Julia Reynolds
fa3fa3483e
Merge "Properly show/hide advanced settings" into oc-mr1-dev
...
am: 12c9d6d65a
2017-09-06 18:39:24 +00:00
Bill Yi
5aba524e60
Import translations. DO NOT MERGE am: 535dd7f066 -s ours am: 6171c4a5bb -s ours
...
am: e93c8d88f5
2017-09-06 18:32:05 +00:00
Bill Yi
e93c8d88f5
Import translations. DO NOT MERGE am: 535dd7f066 -s ours
...
am: 6171c4a5bb
2017-09-06 18:29:32 +00:00
Bill Yi
363626edcf
Import translations. DO NOT MERGE
...
am: 535dd7f066
2017-09-06 18:27:10 +00:00
Bill Yi
6171c4a5bb
Import translations. DO NOT MERGE
...
am: 535dd7f066
2017-09-06 18:27:05 +00:00
TreeHugger Robot
12c9d6d65a
Merge "Properly show/hide advanced settings" into oc-mr1-dev
2017-09-06 18:26:13 +00:00
Tony Mak
c04c1baf2e
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev am: 0280441397
...
am: 799c54830b
2017-09-06 18:24:14 +00:00
Tony Mak
799c54830b
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
...
am: 0280441397
2017-09-06 18:12:05 +00:00
TreeHugger Robot
a43af4a43c
Merge "Import translations. DO NOT MERGE"
2017-09-06 18:05:42 +00:00
TreeHugger Robot
0280441397
Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
2017-09-06 17:57:09 +00:00
Fan Zhang
a0372028f0
Clean up test strings
...
- Mark everything untranslatable to avoid TC confusion
Change-Id: Iea43b0f5f63253833d91aeaa11b3c463cd170741
Fixes: 65355069
Test: builds
2017-09-06 10:54:19 -07:00
Antony Sargent
cbb0bcfeae
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am: c3b47925e3
...
am: f92f6c24f1
2017-09-06 16:55:27 +00:00
Antony Sargent
f92f6c24f1
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
...
am: c3b47925e3
2017-09-06 16:53:28 +00:00
Antony Sargent
c3b47925e3
Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
2017-09-06 16:42:41 +00:00
Fan Zhang
aabf364e0e
Create owner file for development package
...
Bug: 65294119
Test: builds
Change-Id: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
2017-09-06 16:35:16 +00:00
Jack He
81266c97ed
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev am: ffea17b57f
...
am: c97bf8daef
2017-09-06 16:33:27 +00:00
Jack He
c97bf8daef
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
...
am: ffea17b57f
2017-09-06 16:31:27 +00:00
TreeHugger Robot
ffea17b57f
Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
2017-09-06 16:25:28 +00:00
Charles He
0a72c23393
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev am: 10adff1163
...
am: e7cf5e6221
2017-09-06 16:12:08 +00:00
Charles He
e7cf5e6221
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
...
am: 10adff1163
2017-09-06 16:06:32 +00:00
Charles He
10adff1163
Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
2017-09-06 15:59:16 +00:00
Charles He
289af93896
Enforce wifi config lockdown on details page.
...
Fixes the bug that, on the new WifiDetailPreference page, the "Forget"
button is not disabled properly for wifi configs created and protected
by DevicePolicyManger.
Robolectric test to follow in a separate CL.
Test: manual, by locking down wifi config with TestDPC
Test: make RunSettingsRoboTests
Bug: 64971700
Bug: 65396674
Change-Id: I27740eabd5eb94415e4258c9c80f91df2d9ab476
2017-09-06 15:58:14 +00:00
Bill Yi
535dd7f066
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ic5ea1a8891c0c4cb30fa9466e2416dd469768814
2017-09-06 08:36:23 -07:00
Bill Yi
c5aa59ac2d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: Ie01e378113e1d71c095e3a750b668d59bf3e4c46
2017-09-06 08:31:10 -07:00
Bill Yi
ef8151c8b3
Import translations. DO NOT MERGE
...
Change-Id: If965ef4d51917904739ed4726b036a285adc6d6d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-06 08:15:05 -07:00
Julia Reynolds
bd42fe5880
Properly show/hide advanced settings
...
Change-Id: I31f6f877f1945187a6f19e1b383bd3755656fb9b
Fixes: 65375390
Test: manual
2017-09-06 10:36:22 -04:00
Tony Mak
ee36bb98a1
Fix policy transparency is missing in remove work profile button
...
The policy transparency code is not triggered as the button is disabled.
BUG: 64570769
Test: 1. Remove work profile without restriction.
Test: 2. Remove work profile with restriction. Observed a dialog explains
why it is disabled.
Test: 3. Verify setting new admin, uninstall and deactivate button are
working
Change-Id: I1fc9c996785c67daf41a5d31e732d9d82eb56b17
2017-09-06 10:34:21 +00:00
edgar.huang
d2a65d5f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab am: e096a55f03
...
am: 8aeabc23c6
2017-09-06 01:56:23 +00:00
edgar.huang
8aeabc23c6
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
...
am: e096a55f03
2017-09-06 00:44:05 +00:00
edgar.huang
e096a55f03
Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7
...
am: 8f42d1a4ab
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab
Merge "Settings is crashed high probability when doing follow steps"
...
am: 2584202cb7
2017-09-06 00:21:17 +00:00
Treehugger Robot
2584202cb7
Merge "Settings is crashed high probability when doing follow steps"
2017-09-06 00:12:44 +00:00
Jack He
c9d7e8767b
Bluetooth: In-band ringtone setting should be reset to true
...
* Enable in-band ringing setting should be reset to true when toggling
developer options switch
Bug: 65382863
Test: make, try toggling "Enable in-band ringing" preference
Change-Id: Ic3221710983d5c493fa3dff36bc24611948fc4c1
2017-09-05 15:44:48 -07:00
Fan Zhang
657286112f
Pre-set initial state to wifi tether switches.
...
The preset initial state helps eliminating animation jank when first
landing on the page.
Change-Id: Ia7ba83983f18409b1c653cc1ebb0f3aad281358c
Fixes: 64811322
Test: robotests
2017-09-05 13:57:14 -07:00
Adrian Roos
b1758afdf0
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb708f
...
am: 2faa5e7ac5
2017-09-05 18:58:22 +00:00
Adrian Roos
2faa5e7ac5
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
...
am: d57edb708f
2017-09-05 18:55:47 +00:00
TreeHugger Robot
d57edb708f
Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
2017-09-05 18:43:30 +00:00
Antony Sargent
c626fcc028
Fix Bluetooth switch status in Connected devices screen
...
The symptom observed is that the Bluetooth master switch on the
Connected devices page doesn't properly respond to Bluetooth turning off
via quicksettings - either turning on airplane mode or just toggling
Bluetooth.
The root cause was that MasterSwitchPreference's isChecked method would
not return the true value of whether the switch was checked - if the
control is disabled, it always just returns false. This interacts badly
with code in BluetoothEnabler - we disable the switch when the Bluetooth
state is in transition (eg becomes STATE_TURNING_OFF), and we also
attempt to avoid calling setChecked if the switch is already in the
desired state. So the switch would be checked but disabled, and we'd
avoid ever calling setChecked(false) on it.
A thorough fix would be to remove the code from MasterSwitchPreference's
isChecked method that looks at the enabled state, since enabled and
checked really should be treated as separate concerns. But given the
timeframe of MR1, we're opting for a more conservative fix of directly
accessing the switch and checking it's state, to avoid introducing bugs
in other consumers that might be depending on the current
behavior. We'll then do the thorough fix on the master branch which will
give a lot more time for any unexpected issues to be found (I audited
other usages and none seemed likely to be a problem, but it's better to
be safe than sorry).
Change-Id: I19a6c6b71e74595be3ef32a9718a430b67a89d53
Bug: 64940731
Test: make RunSettingsRoboTests
2017-09-05 17:10:30 +00:00
Adrian Roos
1262f39600
FRP: Use SUW theme for factory reset protection flow
...
Bug: 37224506
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL com.android.settings; verify it uses correct theme
Change-Id: I237d8d84840398ebfdc97bf99dce07447042b349
2017-09-05 13:52:26 +02:00
