Commit Graph

38943 Commits

Author SHA1 Message Date
TreeHugger Robot
12c9d6d65a Merge "Properly show/hide advanced settings" into oc-mr1-dev 2017-09-06 18:26:13 +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
Antony Sargent
c3b47925e3 Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev 2017-09-06 16:42:41 +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
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
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
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
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
TreeHugger Robot
3d1f6abd6f Merge "Make photos/videos storage preference normal." into oc-mr1-dev 2017-09-02 03:29:52 +00:00
Daniel Nishi
9be0ce09c9 Make photos/videos storage preference normal.
We had special behavior for it in the past, but this defines new
behavior that is much closer to what the other storage preferences do.
A photo app filter is used and a photos/video files preference exists on
it which intents over to the gallery app.

Fixes: 64147318
Test: Settings robotests

Change-Id: I47284515fe2dfcc924ae61a44bc47051e9f5fda6
2017-09-01 17:51:56 -07:00
TreeHugger Robot
5fe8e76b36 Merge "Set drawable for the entity header app preference button." into oc-mr1-dev 2017-09-02 00:17:08 +00:00
Daniel Nishi
8618b8649f Merge "Show work profile apps only on app list." into oc-mr1-dev 2017-09-01 22:49:21 +00:00
Amit Mahajan
cf11e21d47 Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev 2017-09-01 22:42:09 +00:00
Doris Ling
a7b40995de Set drawable for the entity header app preference button.
In the entity header layout, the action buttons resource is set to null by
default. When we bind the button with the app preference action, we
should also set the drawable to the settings icon as well.

Change-Id: Ic259b4c538f529671ca5a9c67664ef32fbbb25ae
Fixes: 64826061
Test: make RunSettingsRoboTests
2017-09-01 14:52:30 -07:00
Daniel Nishi
83ceab82e4 Show work profile apps only on app list.
For the work profile drilldown, we used to show all apps when the user
drilled down into the categories. This makes it so that the drill down
only shows the work apps when that deep.

Change-Id: I492cd3e9b9b923b87b68645a871dcfb2b91b4f95
Fixes: 62963093
Test: Settings robotest
2017-09-01 13:08:48 -07:00
Doris Ling
f664c77f31 Update accessibility preference icon.
Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes: 65256821
Test: visual
2017-08-31 14:58:15 -07:00
Amit Mahajan
a00af97ab1 Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-08-31 21:01:25 +00:00
TreeHugger Robot
49d25a0506 Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev 2017-08-31 19:51:50 +00:00
TreeHugger Robot
bf66bf30b1 Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev 2017-08-31 19:16:50 +00:00
Phil Weaver
8d9e305d84 resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0  -s ours

Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5
2017-08-31 17:34:39 +00:00
Daniel Nishi
260ec8b9ea Merge "Tint the work icon." into oc-mr1-dev 2017-08-31 17:20:14 +00:00
Zhijun He
13991ff9f3 Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev 2017-08-31 04:20:59 +00:00
Jack He
6108d6c22e Bluetooth: do not dimiss fragment when Activity.finish() is called
* When Activity.finish() is called, it's associtated fragments are all
  dismissed automatically
* Cached used fragments are dimissed in onCreate() before new ones are
  created

Bug: 62230203
Test: Pair with Bluetooth device, Settings unit tests
Change-Id: Ieca88ba0660c5407f0d88d572d06a722c642ac39
2017-08-30 18:44:39 -07:00
Fan Zhang
24dc1ab39e Misc icon updates
Fixes: 65204006
Test: visual
Change-Id: I4414438abdfe1726458d454b331ec0e2ce77fcb7
2017-08-30 17:06:17 -07:00
Phil Weaver
f65e790ba0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
Bug: 62196835
Test: I solemnly swear I tested this conflict resolution.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3
Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf
2017-08-30 22:57:39 +00:00
Lei Yu
f5d7db2cfa Merge "Add device/profile app check in background check" into oc-mr1-dev 2017-08-30 17:02:21 +00:00
jackqdyulei
00015fbf50 Add device/profile app check in background check
If app is device or profile app, we disable the background check
toggle. This cl also create an util method for this check and
remove duplicate code

Bug: 64665807
Test: RunSettingsRoboTests
Change-Id: Id8336eadaac8832327bc3653aaa7dfbacde352ac
2017-08-29 16:10:36 -07:00
Bill Yi
ef5d680cc4 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I334be8406b13c2b00047753ed84f62cf6ae71fbd
2017-08-29 14:36:06 -07:00
Daniel Nishi
1568c56de9 Tint the work icon.
Bug: 64475406
Test: Manual
Change-Id: Ibe817a9c099439db91aca1a858e5cf5562fa6a4a
2017-08-29 13:55:06 -07:00
TreeHugger Robot
99d524e52b Merge "Fix to show correct value for data limit setting" into oc-mr1-dev 2017-08-29 19:28:31 +00:00
TreeHugger Robot
3042af11f0 Merge "Prevent race condition between SavedQuery and Query Loader" into oc-mr1-dev 2017-08-29 18:42:25 +00:00
Steven Timotius
4ccfa7c163 Fix to show correct value for data limit setting
Bug: 64901297
Test: Manually set a value for data limit in Settings, verify text is correct
Change-Id: Ieec3ce39b55754b54caefd2be923afe9883682b1
(cherry picked from commit 72ebf8fe35)
2017-08-29 16:55:05 +00:00
Matthew Fritze
21aed344fc Prevent race condition between SavedQuery and Query Loader
SearchFragment and SavedQueryLoader share a loader manager
and had been using the same loader id for different
loaders.

Occaisionally (in monkey tests) two loaders with the same
IDs would be started and crash when they finished.

The loaders now have different IDs.

Change-Id: I11e9b7365605fbcef44cf7d2323183415422f5c8
Fixes: 64756515
Test: robotests
2017-08-29 08:20:51 -07:00
Sundeep Ghuman
2716e841be Separate multiple DNS addresses with newlines.
Bug: b/65037256
Test: make -j40 RunSettingsRoboTests
Change-Id: I4b0709648f8e236177ea73338cfb0d42a5971c06
2017-08-28 18:47:48 -07:00
Phil Weaver
94c5202965 Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.

Bug: 37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.

Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3

Change-Id: I858f3585b2e7d334cddcf38bd0ac6481e778b6b6
2017-08-29 00:57:11 +00:00
TreeHugger Robot
6f72b57428 Merge "Fix crash in developer settings when backup is not available" into oc-mr1-dev 2017-08-28 23:15:26 +00:00
TreeHugger Robot
ccbb613fa9 Merge "Remove subtitle for Recent location apps" into oc-mr1-dev 2017-08-28 19:55:39 +00:00
Lei Yu
088393596e Merge changes from topics "anomaly_test_app_step_6", "anomaly_test_app_step_5" into oc-mr1-dev
* changes:
  Add functional test for wakelock anomaly detector
  Add functional test for bt anomaly detector
2017-08-28 17:35:59 +00:00
Alex Vakulenko
070b31216a Fix crash in developer settings when backup is not available
When backup feature is disabled, Developer Settings dialog does
not come up due to a crash.

Disable Backup Password option in the preference screen.

Bug: 64725174
Test: Developer settings dialog comes up and Backup password is
      disabled on Polaris

Change-Id: I4f4546c4e97d2e5128ec65c0532691d9799b4c8f
2017-08-26 01:10:43 +00:00
Jack He
19ba320263 Bluetooth: Only show devices when their names are resolved
* Add a developer menu option to allow name-less devices to be shown
  when a Bluetooth developer needs it, but hide it for non-developer
  users.
* Set BluetoothDevicePreference to invisible when CachedBluetoothDevice
  does not have a name besides MAC address and the above developer option
  is false.
* This affects BluetoothPairingDetail and DevicePickerFragment, but does
  not affect BluetoothSettings. BluetoothSettings will show all paired
  devices regardless whether an user friendly name exists.

Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: Idd7ad4b1671dfdcf3204efb50eddb6dae1065aa5
2017-08-25 16:27:30 -07:00
jackqdyulei
f1ed210eaa Remove subtitle for Recent location apps
Bug: 65011654
Test: Screenshot
Change-Id: I840e6ee8f755b4bbb5392a80224dc5b4b19a8054
2017-08-25 14:37:39 -07:00
jackqdyulei
d8bfc74256 Add functional test for wakelock anomaly detector
Bug: 63815938
Test: runtest -x WakelockAnomalyTest
Change-Id: I4d10d5be8b38264f29c67c2c945fdbbd1090430d
2017-08-25 14:02:39 -07:00
jackqdyulei
e4298941b4 Add functional test for bt anomaly detector
This cl:
Set up the environment for functional test
1. Update Android.mk by adding instrumentation and libs
2. Update AndroidManifest.xml by adding runner

Add functional test for bt anomaly, with the following workflow
1. reset battery stats
2. pretend unplug and screen off
3. Start AnomalyTester app, set values and click start button
4. Wait its running
5. Check anomaly preference in battery main page
6. reset all parameters

Bug: 63815938
Test: runtest -x BluetoothAnomalyTest
Change-Id: Ief02a314d21f6c32d70729047a1d4bdce9ad9920
2017-08-25 13:45:16 -07:00
TreeHugger Robot
77bd8c3a73 Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev 2017-08-25 18:25:03 +00:00
Daniel Nishi
2b53a8467c Merge "Re-init storage size on resume." into oc-mr1-dev 2017-08-25 16:51:45 +00:00
TreeHugger Robot
08fecc4143 Merge "Add wakelock action in testing app" into oc-mr1-dev 2017-08-25 03:35:46 +00:00