Commit Graph

36767 Commits

Author SHA1 Message Date
TreeHugger Robot
535533680f Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev 2017-05-31 11:58:39 +00:00
Lorenzo Colitti
8b1926888f Improve testing of IP address display code.
This is a test-only change whose goal is to increase our
confidence in future changes that touch the actual code.

Bug: 62171690
Test: make -j64 RunSettingsRoboTests
Change-Id: Ic5122453c9fec2b166fcfe0c5c33be2705c10906
2017-05-31 18:35:37 +09:00
Jeff Sharkey
77fe8c1e9e Consistent "low storage" behavior.
Fix several bugs related to storage accounting.  Since getDataBytes()
already includes cached data, we need to subtract it to avoid blaming
apps for it.

We also need to blame app code on someone, so we blame it on the
current user.  StorageStatsManager was fixed awhile back to only
return the app code size on the requested storage volume, so we can
remove the system app checks.

Subtract "appBytes" from external storage accounting, since it's
already been blamed elsewhere against specific apps.

Pass along storage results from all users on the device, and subtract
them all when estimating size of "system" data.  To avoid embarrassing
estimation bugs, make sure that "system" data is at least 1GB.

Bug: 38008706
Test: cts-tradefed run commandAndExit cts-dev -m CtsJobSchedulerTestCases -t android.jobscheduler.cts.StorageConstraintTest
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Change-Id: Ide1e6d0690e5ad4e751c87891f63ba1036434619
2017-05-30 23:51:06 -06:00
Adrian Roos
052095a7d7 Merge "Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential" 2017-05-31 04:33:34 +00:00
Adrian Roos
0e60489bf2 Merge "AOD: Ambient display settings to dedicated settings screen" 2017-05-31 04:25:39 +00:00
TreeHugger Robot
37ec0b17eb Merge "Change header in choose lock password" 2017-05-31 03:48:57 +00:00
TreeHugger Robot
a66a8b74b5 Merge "Bluetooth: Enable in-band ringing by default (1/2)" 2017-05-31 03:36:17 +00:00
TreeHugger Robot
2945ffb76f Merge "Resize fingerprint added illustration to specs" 2017-05-31 03:35:36 +00:00
TreeHugger Robot
f7f5196cf5 Merge "AccountTypePreference layout clean up." 2017-05-31 02:22:06 +00:00
TreeHugger Robot
c2a48b1da1 Merge "Revert "Revert "Share preference controller in AdavancedAppSettings search""" 2017-05-31 02:14:01 +00:00
Adrian Roos
5a9a3cde62 Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential
Bug: 36814845
Test: adb shell settings put global device_provisioned 0 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL
Change-Id: Id6ce6bc5ebd9c9e2a88790cc800678aff50e580f
2017-05-30 18:25:18 -07:00
Hugo Benichi
2d31889379 Merge "Wifi details page: sign-in uses primary color" into oc-dev am: 0c5573a0e3
am: 5716f6cc7e

Change-Id: Ifb6f4a26fbbcd356f7fc0ff25c552cdd9da5c73d
2017-05-31 00:47:54 +00:00
Fan Zhang
c62808a5a3 Revert "Revert "Share preference controller in AdavancedAppSettings search""
Bug: 62141436
Test: make RunSettingsRoboTests -j40
This reverts commit b2676a769e.

Change-Id: I27c8df94a3103602d2e176670bcf1f82528e70c0
2017-05-30 17:47:41 -07:00
Fan Zhang
f555e75c22 Merge "Revert "Share preference controller in AdavancedAppSettings search"" 2017-05-31 00:42:54 +00:00
Fan Zhang
b2676a769e Revert "Share preference controller in AdavancedAppSettings search"
Bug: 62141436

It has failing robolectric test but treehugger didn't catch it for some reason.

This reverts commit 3541f597a4.

Change-Id: Id4bc0ba2d5995092c625a54fa415ff0c2c6785cb
2017-05-31 00:42:22 +00:00
Doris Ling
1e914eb875 Update summary for Hotspot & Tethering.
- change summary for Bluetooth tethering and USB tethering to static
text.
- add strings for Wi-Fi hotspot settings page.

Bug: 62069132
Test: manual
Change-Id: Ibc550da33c192c604b65eb75d16c6c15a8b1ff7a
2017-05-30 17:28:06 -07:00
Hugo Benichi
5716f6cc7e Merge "Wifi details page: sign-in uses primary color" into oc-dev
am: 0c5573a0e3

Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
2017-05-31 00:27:43 +00:00
Hugo Benichi
0c5573a0e3 Merge "Wifi details page: sign-in uses primary color" into oc-dev 2017-05-31 00:16:43 +00:00
Adrian Roos
e349ec30d8 AOD: Ambient display settings to dedicated settings screen
Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
2017-05-30 16:42:37 -07:00
Suprabh Shukla
6ac7b8c6be Merge "Disabling the activate button when paused" into oc-dev am: dacdcb9b42
am: 04c93c6628

Change-Id: Idad6231a35a90b401651effd59123a647985336f
2017-05-30 23:20:08 +00:00
TreeHugger Robot
b713d16315 Merge "Add string needed by new device suggestion" 2017-05-30 23:12:19 +00:00
Suprabh Shukla
04c93c6628 Merge "Disabling the activate button when paused" into oc-dev
am: dacdcb9b42

Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
2017-05-30 23:12:10 +00:00
jackqdyulei
f7d07a6296 Update user string for battery
Bug: 37293179
Test: Build
Change-Id: I6589d51e12a59622a8773c808e1c365880921cae
2017-05-30 16:02:33 -07:00
Suprabh Shukla
dacdcb9b42 Merge "Disabling the activate button when paused" into oc-dev 2017-05-30 23:02:15 +00:00
jackqdyulei
de3bb7194d Add method to calculate last full charge time
Bug: 38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
2017-05-30 15:51:29 -07:00
Jack He
52978360e1 Bluetooth: Enable in-band ringing by default (1/2)
Bug: 19171297
Test: make, make calls, HFP regression
Change-Id: Id1d44e07a939d121ccf05466239d3cb5cc4b3199
2017-05-30 15:17:33 -07:00
Rebecca Silberstein
141e442e26 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am: bbc260d408
am: cba166d380

Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd
2017-05-30 22:11:21 +00:00
Phil Weaver
56f3c8eb3d Merge "Fix clickjacking again for accessibility services" into oc-dev am: 7348c5c91b
am: 91df0c9a03  -s ours

Change-Id: I683f75c1b25b74d060c8ad0dc89063dc1f303eba
2017-05-30 22:10:53 +00:00
Rebecca Silberstein
cba166d380 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am: bbc260d408

Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
2017-05-30 22:02:18 +00:00
Phil Weaver
91df0c9a03 Merge "Fix clickjacking again for accessibility services" into oc-dev
am: 7348c5c91b

Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
2017-05-30 22:01:40 +00:00
Fan Zhang
d00f006236 AccountTypePreference layout clean up.
Bug: 35961001
Test: visual
Change-Id: Iaeb605e7eed0d75a77d893f6b849e26482311b08
2017-05-30 14:52:51 -07:00
Rebecca Silberstein
bbc260d408 Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev 2017-05-30 21:48:37 +00:00
Phil Weaver
7348c5c91b Merge "Fix clickjacking again for accessibility services" into oc-dev 2017-05-30 21:45:37 +00:00
TreeHugger Robot
08a02c439d Merge "Share preference controller in AdavancedAppSettings search" 2017-05-30 21:41:57 +00:00
Fan Zhang
66a3d72cf6 Add string needed by new device suggestion
Bug: 62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
2017-05-30 14:24:10 -07:00
Matthew Fritze
26bd4d1807 Merge "Location summary is no longer indexed" into oc-dev am: fed6e817a5
am: 53c8d6c2b2

Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb
2017-05-30 20:51:00 +00:00
TreeHugger Robot
cf162d1291 Merge "Extend single line summary preference to multi line." 2017-05-30 20:48:18 +00:00
Matthew Fritze
53c8d6c2b2 Merge "Location summary is no longer indexed" into oc-dev
am: fed6e817a5

Change-Id: Id776317a3925920652677ec884be7b9bf73e90d3
2017-05-30 20:38:57 +00:00
Daniel Sheng
64c3677169 Merge "Tweaked camera lift trigger suggestion summary." 2017-05-30 20:36:31 +00:00
TreeHugger Robot
fed6e817a5 Merge "Location summary is no longer indexed" into oc-dev 2017-05-30 20:24:23 +00:00
Matthew Fritze
36653892d4 Add related assist-gesture keywords
Wake squeeze and alarm gestures are for settings under
development.

Bug: 62191990
Test: string changes
Change-Id: Iac22a9ab9e63f1e3d97f62d3c470cf07b5da3636
2017-05-30 13:11:51 -07:00
Maurice Lam
7551c80bc8 Pass component name into SuggestionFeatureProvider
So that the provider can be used for more than one suggestion.

Test: Robolectric test for implementation of the provider
Bug: 62039057
Change-Id: Ibea41ea6d98e67c55ec157556675e854f3ea31c4
2017-05-30 13:07:51 -07:00
Daniel Nishi
4fcb5f6b7c Merge "Fix an override filter bug." into oc-dev am: 5cc0a122d3
am: 23c2cf1d68

Change-Id: I88545ebb5e3a1b05268b7485c0d7dc4323ff661f
2017-05-30 19:54:19 +00:00
Fan Zhang
3541f597a4 Share preference controller in AdavancedAppSettings search
Change-Id: I4283f35a91ce10e01fa4c9d1cf626b1d2a30082c
Fix: 62141436
Test: make RunSettingsRoboTests
2017-05-30 12:51:08 -07:00
Daniel Nishi
23c2cf1d68 Merge "Fix an override filter bug." into oc-dev
am: 5cc0a122d3

Change-Id: I9188da01862ae2af964ac09b84f5b3c6078572cc
2017-05-30 19:50:21 +00:00
Phil Weaver
64822d40dc Merge "Manual merge of ag/2319717" 2017-05-30 19:46:18 +00:00
Daniel Nishi
5cc0a122d3 Merge "Fix an override filter bug." into oc-dev 2017-05-30 19:44:38 +00:00
TreeHugger Robot
5d2377f66a Merge "Disallow adding/editing dun APNs unless allowed by carrier." 2017-05-30 19:38:30 +00:00
TreeHugger Robot
94c57104d6 Merge "Use the standard place holder for the security summary." 2017-05-30 19:33:07 +00:00
Fan Zhang
d35f90c289 Extend single line summary preference to multi line.
also updated some strings char limit.

Change-Id: Ie068ecc410bb8211b4cd5e32a5539c824c48040f
Fix: 36413664
Fix: 62079108
Test: make RunSettingsRoboTests
2017-05-30 11:48:20 -07:00