Commit Graph

39997 Commits

Author SHA1 Message Date
TreeHugger Robot
a43af4a43c Merge "Import translations. DO NOT MERGE" 2017-09-06 18:05:42 +00:00
Antony Sargent
cbb0bcfeae Merge "Fix Bluetooth switch status in Connected devices screen" into oc-mr1-dev am: c3b47925e3
am: f92f6c24f1

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

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

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

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

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

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
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
edgar.huang
d2a65d5f03 Merge "Settings is crashed high probability when doing follow steps" am: 2584202cb7 am: 8f42d1a4ab am: e096a55f03
am: 8aeabc23c6

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

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
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
Adrian Roos
b1758afdf0 Merge "FRP: Use SUW theme for factory reset protection flow" into oc-mr1-dev am: d57edb708f
am: 2faa5e7ac5

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

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
09ed020f13 Merge "Make photos/videos storage preference normal." into oc-mr1-dev am: 3d1f6abd6f
am: 5467aed58d

Change-Id: Ic5218a18aa0ea099a113a4c45737baf6bfc05e3a
2017-09-02 03:58:04 +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
87ca13d446 Merge "Set drawable for the entity header app preference button." into oc-mr1-dev am: 5fe8e76b36
am: c905662743

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

Change-Id: Ieb84a6732af3eacb9d576ecc9cb685cff38b8e20
2017-09-01 23:37:21 +00:00
Amit Mahajan
933a4f062d Merge "Change to disable mvno data field in ApnEditor if needed." into oc-mr1-dev am: cf11e21d47
am: f161b63c2a

Change-Id: I10c73c2b94d521860d569d3fb7ef5560dde4393b
2017-09-01 23:35:35 +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
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
TreeHugger Robot
f4dc03184b Merge "Removed deprecated BIND_AUTOFILL permission." 2017-09-01 15:11:50 +00:00
Julia Reynolds
0e497230d9 Merge "Add settings page for notification channel groups" 2017-09-01 12:49:39 +00:00
Doris Ling
100e8a3891 Update accessibility preference icon. am: f664c77f31
am: c413dd167d

Change-Id: Iccbd479e32a7abdd8e8fbf16274825354dbe5805
2017-09-01 01:15:08 +00:00
Doris Ling
c413dd167d Update accessibility preference icon.
am: f664c77f31

Change-Id: I53d15d3a850f5f0bdae9add3003a00b6e7c80009
2017-09-01 00:47:41 +00:00
TreeHugger Robot
650faa3ace Merge "Fix ClassScanner and re-enable CodeInspectionTest tests" 2017-08-31 23:26:51 +00:00
Colin Cross
c19d2bccbf Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours am: 450f423a21 -s ours
am: bfab966085  -s ours

Change-Id: I53491f4186ffcdd48c6dc0184018fc982a75d549
2017-08-31 22:43:03 +00:00
Colin Cross
bfab966085 Merge "Fix errorprone build" am: 0bed3cacd7 -s ours am: a1bcb02184 -s ours
am: 450f423a21  -s ours

Change-Id: I4a0aff24c589b0a1eefa97b9f1c9dd144e395303
2017-08-31 22:35:19 +00:00
Colin Cross
450f423a21 Merge "Fix errorprone build" am: 0bed3cacd7 -s ours
am: a1bcb02184  -s ours

Change-Id: Ic3b3ce30a29b967189fae95ec53f52569350fa82
2017-08-31 22:27:59 +00:00
Colin Cross
a1bcb02184 Merge "Fix errorprone build"
am: 0bed3cacd7  -s ours

Change-Id: I3c6b80920db044b842946e373dbc1efddd260de8
2017-08-31 22:24:00 +00:00
Treehugger Robot
0bed3cacd7 Merge "Fix errorprone build" 2017-08-31 22:16:52 +00:00
Doris Ling
f664c77f31 Update accessibility preference icon.
Change-Id: I84fb84e0a8bb422b9e453bd9b94e99bfb8a73be3
Fixes: 65256821
Test: visual
2017-08-31 14:58:15 -07:00