Commit Graph

17774 Commits

Author SHA1 Message Date
Joe Onorato
86457af8db Merge "Add unoptimized ble scans to batterystats." into oc-dev am: 37eb1c580b
am: 98952ced4f

Change-Id: I14df97cb60643605ae0f34642aedc91abb68c475
2017-05-31 20:06:05 +00:00
Joe Onorato
98952ced4f Merge "Add unoptimized ble scans to batterystats." into oc-dev
am: 37eb1c580b

Change-Id: Ia794a4e1d51a6a0a28b65f9ade1530ca2c79cf90
2017-05-31 19:50:03 +00:00
TreeHugger Robot
ad587bf155 Merge "Update updateEmptyView" 2017-05-31 19:32:33 +00:00
Joe Onorato
37eb1c580b Merge "Add unoptimized ble scans to batterystats." into oc-dev 2017-05-31 19:27:04 +00:00
Fan Zhang
77ee0b08dd Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.

Change-Id: I8ea431b52e50e424be55946f70175db5412e2f4a
Merged-In: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix: 38250742
Test: make RunSettingsRoboTests
2017-05-31 12:16:49 -07:00
Alison Cichowlas
2280afc54e Add group name into channel summary, if applicable.
Bug: 36642898
Test: ran integration & robo tests (no new failures); verified manually with apps with channels & without.

Change-Id: I16a255b0e5d929f4485d3725bd18179e6f411c03
2017-05-31 15:12:25 -04:00
TreeHugger Robot
6af679a4bf Merge "Update summary for Hotspot & Tethering." 2017-05-31 19:09:36 +00:00
Christine Franks
2d0293951a Allow FR in carrier demo mode
Bug: 62133292
Test: make RunSettingsRoboTests -j100, and manually verified FR is
available in carrier demo mode.

Change-Id: Ia793bf234b229da0490accfea6d44b72395a04bc
2017-05-31 12:04:01 -07:00
Fan Zhang
a45f3d2f33 Add method to disable "disable" button in installed app UI
OEMs can now force grey out the "disable" button for important apps on
device.

Change-Id: Ic075a07ad12592bd60238c7b1c9ab84932c8db3c
Fix: 38250742
Test: make RunSettingsRoboTests
2017-05-31 11:53:29 -07:00
Daniel Nishi
6f92b661a4 Fix a bug where cache was double-counted.
Cache was being counted as cache and also as data in the app info page.
This is due to a faulty assumption I made that getDataBytes() and
getCacheBytes() measured distinct areas of storage (in actuality,
getCacheBytes() is a subset of getDataBytes()). This improper assumption
also led to the unit test being incorrect.

Change-Id: I4144d50800f82feaecb7a0a8dff26be3e4f14da8
Fixes: 62182151
Test: Settings robotest & manual
2017-05-31 11:00:51 -07:00
Jeff Sharkey
7c236a0c7e Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit
Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13
2017-05-31 09:05:30 -06:00
Jeff Sharkey
47eec246a9 Merge "Consistent "low storage" behavior." into oc-dev
am: 552e3c4dba

Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
2017-05-31 14:48:43 +00:00
Jeff Sharkey
552e3c4dba Merge "Consistent "low storage" behavior." into oc-dev 2017-05-31 14:18:34 +00:00
Esteban Talavera
486e966bde Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev am: 535533680f
am: 112f8d88fd

Change-Id: I23d0ee4977fc544b35723512977670cd2686c7d1
2017-05-31 12:09:31 +00:00
Esteban Talavera
112f8d88fd Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am: 535533680f

Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628
2017-05-31 12:04:57 +00:00
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
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
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
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
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
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
TreeHugger Robot
cf162d1291 Merge "Extend single line summary preference to multi line." 2017-05-30 20:48:18 +00: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