Commit Graph

19251 Commits

Author SHA1 Message Date
TreeHugger Robot
dad9b79630 Merge "Pre-set initial state to wifi tether switches." into oc-mr1-dev 2017-09-06 19:53:39 +00:00
Julia Reynolds
fa3fa3483e Merge "Properly show/hide advanced settings" into oc-mr1-dev
am: 12c9d6d65a

Change-Id: Id5e2a6291b630114fc4952ed49fcd57929205461
2017-09-06 18:39:24 +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
799c54830b Merge "Fix policy transparency is missing in remove work profile button" into oc-mr1-dev
am: 0280441397

Change-Id: Ibe78c546ae2d510c7f33862b700b9873e554743c
2017-09-06 18:12:05 +00:00
Fan Zhang
31d8a89220 Misc polishing fixes for Settings
- Never return null when querying userDictionaryLocales
- Auto mirror mobile setting icon in RTL to match status bar.

Fixes: 65298627
Fixes: 65361092
Test: robotests
Change-Id: I0f9827f7bc23baf4895712c0f86584aeccfb9c73
2017-09-06 10:58:52 -07: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
Daniel Nishi
9e6d39e71a Turn in the work profile's badge.
The badge is no longer part of the preferred work profile UX. By
removing the code which badges the preferences for the individual
storage items, we can avoid placing the no longer needed tiny badges.

Change-Id: I6fd2ec28d3cf55e3a95b877f4c7b9b51c94e12d8
Fixes: 64475406
Test: Manual
2017-09-06 10:11:48 -07:00
Antony Sargent
f92f6c24f1 Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev
am: c3b47925e3

Change-Id: I7c9a07543340992e8bd3ff15538d74d28a1aab22
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
Jack He
c97bf8daef Merge "Bluetooth: In-band ringtone setting should be reset to true" into oc-mr1-dev
am: ffea17b57f

Change-Id: I4295f1c186863d157520d93abfe0cbaf3c354247
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
e7cf5e6221 Merge "Enforce wifi config lockdown on details page." into oc-mr1-dev
am: 10adff1163

Change-Id: I8aed4d127bc84c457a672cc5e524aa7ac477b15d
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
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
8aeabc23c6 Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab
am: e096a55f03

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

Change-Id: Ie44be5ec6a14bc137b08d6c233704af03f4a27ad
2017-09-06 00:30:44 +00:00
edgar.huang
8f42d1a4ab Merge "Settings is crashed high probability when doing follow steps"
am: 2584202cb7

Change-Id: I6292acd5c7766c1cf13d2de4757fe4499a076f46
2017-09-06 00:21:17 +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
Daniel Nishi
fb302de0d6 Cache storage values for fast loading.
If the user moves away from the storage fragment and returns, this
allows us to use cached data from the previous calculation. If the data
is > 1 minute old, we consider it stale. Otherwise, we can bypass the
loading screen.

Fixes: 37923463
Test: Settings Robotest

Change-Id: I7650d4d742852f8d447878c077b9190bc0a0bb22
2017-09-05 14:46:14 -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
Stephen Chen
8ffcbccbce Make auto Wi-Fi summary text consistent with feature availability.
"Turn Wi-Fi on automatically" feature is disabled when airplane mode or
battery saver mode is enabled, when Wi-Fi scanning is disabled, or when
network recommendations are disabled / scorer unset. This change
captures these negative cases in the summary text.

Bug: 65085700
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I2f2d22b5bef3ad03a28d34e79a27e6545cac557f
2017-09-05 13:51:58 -07:00
Alison Cichowlas
eaabcfaa78 Reorder "on the lock screen" options.
Fixes: 62872287
Change-Id: I7b2755e7a33fa1a31cebd18d93d268d330d87794
Test: RunSettingsRoboTests, manual
2017-09-05 19:04:29 +00:00
Adrian Roos
2faa5e7ac5 Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev
am: d57edb708f

Change-Id: I385acf93d60bfbc98f39aa0178018e3976a39974
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
edgar.huang
ab6f11f47f Settings is crashed high probability when doing follow steps
Enter into the fingerprint list screen and delete and identification of operation at the same time, when the item of the fingerprint verification was deleted, highlighting the item to be deleted, just so NullPointerException occurred.
Test: manual - enrolling a fingerprint and do above steps.
2017-09-05 06:35:27 +00:00
Daniel Nishi
5467aed58d Merge "Make photos/videos storage preference normal." into oc-mr1-dev
am: 3d1f6abd6f

Change-Id: Ic944357091b2cd16115fd4b0f3ff0459090a3e27
2017-09-02 03:39:51 +00: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
Doris Ling
c905662743 Merge "Set drawable for the entity header app preference button." into oc-mr1-dev
am: 5fe8e76b36

Change-Id: I02625057fd4636f8ce61d5772f7ce4083fb7f81f
2017-09-02 00:41:28 +00: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
d3e0d745a8 Merge "Show work profile apps only on app list." into oc-mr1-dev
am: 8618b8649f

Change-Id: I8757ff64193dc0754b01aa769e55a355464e2d01
2017-09-01 23:17:06 +00:00
Amit Mahajan
f161b63c2a Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev
am: cf11e21d47

Change-Id: Ica848195898e8d88e3882091c2a06ff4e79e55ca
2017-09-01 23:15:59 +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
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
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
Jack He
4dddaf18e1 Merge "Bluetooth: do not dimiss fragment when Activity.finish() is called" into oc-mr1-dev
am: bf66bf30b1

Change-Id: Id5f413c21eb39e540d2417f9c19b7553f57d6b6a
2017-08-31 19:25:33 +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
Daniel Nishi
270f217c9f Merge "Tint the work icon." into oc-mr1-dev
am: 260ec8b9ea

Change-Id: I4315981fab4efde7197e1026f2a2ba140647252b
2017-08-31 17:46:01 +00:00
Phil Weaver
f8a7b8aff0 resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204
2017-08-31 17:34:40 +00:00
Daniel Nishi
260ec8b9ea Merge "Tint the work icon." into oc-mr1-dev 2017-08-31 17:20:14 +00:00
Zhijun He
7b63402f83 Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev
am: 13991ff9f3

Change-Id: I47e318a843dcec3192999c2ba168ba646541e3af
2017-08-31 04:25:28 +00:00
Zhijun He
13991ff9f3 Merge "Settings: Enable HAL HDR+ by default" into oc-mr1-dev 2017-08-31 04:20:59 +00:00
Maurice Lam
fe38bfd742 Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page" am: 108611ff34 am: 61c8796a5e
am: 46a04ecca1

Change-Id: I865f8da9a0bbf7be9e6ec74b27b55300c604bde0
2017-08-31 02:39:41 +00:00
Maurice Lam
61c8796a5e Merge "Fix Settings crashes after tapping "Learn more" in fingerprint page"
am: 108611ff34

Change-Id: Ica93d3824f2ebf2ae8207967f1415ebeb8094d2b
2017-08-31 02:10:37 +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