Bill Yi
d8d031701b
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 76e9bd72f9
2017-05-31 18:36:26 +00:00
TreeHugger Robot
76e9bd72f9
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-31 18:18:05 +00:00
TreeHugger Robot
51333ec21f
Merge "Import translations. DO NOT MERGE"
2017-05-31 18:05:16 +00: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
Matthew Fritze
2b562f84b6
Remove dynamic summary from Security Patch info
...
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes: 36101902
Test: builds :)
2017-05-31 09:53:07 -07:00
Jeff Sharkey
63b013ea60
Merge "Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit"
2017-05-31 15:07:19 +00:00
Jeff Sharkey
7c236a0c7e
Merge commit '47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit
...
Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13
2017-05-31 09:05:30 -06:00
TreeHugger Robot
edf845dc58
Merge "Add related assist-gesture keywords"
2017-05-31 14:55:32 +00:00
Jeff Sharkey
47eec246a9
Merge "Consistent "low storage" behavior." into oc-dev
...
am: 552e3c4dba
2017-05-31 14:48:43 +00:00
Bill Yi
ac0b0b8ae2
Import translations. DO NOT MERGE
...
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import
2017-05-31 07:24:59 -07:00
Jeff Sharkey
552e3c4dba
Merge "Consistent "low storage" behavior." into oc-dev
2017-05-31 14:18:34 +00:00
Bill Yi
db95abe6f5
Import translations. DO NOT MERGE
...
Change-Id: I6f6a0cc72995cb233ea7390a862c2ca8ff748751
Auto-generated-cl: translation import
2017-05-31 07:12:21 -07:00
Esteban Talavera
486e966bde
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev am: 535533680f
...
am: 112f8d88fd
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
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
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
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
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
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
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
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
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
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
2017-05-30 22:10:53 +00:00
Rebecca Silberstein
cba166d380
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
...
am: bbc260d408
2017-05-30 22:02:18 +00:00
Phil Weaver
91df0c9a03
Merge "Fix clickjacking again for accessibility services" into oc-dev
...
am: 7348c5c91b
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
2017-05-30 20:51:00 +00:00
