Antony Sargent
e90f29bacf
Bluetooth string changes
...
This includes:
-Title string for device details page
-MAC address string for device details page
Bug: 35876580
Test: make RunSettingsRoboTests
Change-Id: I360996915d1dfa59bbb12f33f42afc4aa0bde64b
2017-06-01 10:28:29 -07:00
Christine Franks
c101dda9f7
Merge "Allow FR in carrier demo mode" into oc-dev am: 9ef166a578
...
am: d974ccb625
Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
2017-05-31 22:54:31 +00:00
Matthew Fritze
3c666f0b27
Merge "Remove dynamic summary from Security Patch info" into oc-dev am: 564d90faf0
...
am: 6a50c4555c
Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
2017-05-31 22:52:58 +00:00
Christine Franks
d974ccb625
Merge "Allow FR in carrier demo mode" into oc-dev
...
am: 9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
2017-05-31 22:52:57 +00:00
Doris Ling
a72775a47a
Merge "Add new strings to highlight gestures in settings."
2017-05-31 22:47:55 +00:00
Christine Franks
9ef166a578
Merge "Allow FR in carrier demo mode" into oc-dev
2017-05-31 22:47:43 +00:00
Matthew Fritze
6a50c4555c
Merge "Remove dynamic summary from Security Patch info" into oc-dev
...
am: 564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
2017-05-31 22:47:27 +00:00
TreeHugger Robot
564d90faf0
Merge "Remove dynamic summary from Security Patch info" into oc-dev
2017-05-31 22:41:28 +00:00
Maurice Lam
15fbe83165
Merge "Center align icon and title in choose lock pattern"
2017-05-31 22:37:00 +00:00
TreeHugger Robot
f03bf1843a
Merge "Add method to disable "disable" button in installed app UI"
2017-05-31 21:46:36 +00:00
TreeHugger Robot
23eca9a2c4
Merge "Update user string for battery"
2017-05-31 21:39:43 +00:00
TreeHugger Robot
10534456ed
Merge "Update bluetooth strings in settings"
2017-05-31 21:14:31 +00:00
Maurice Lam
996eaff52e
Center align icon and title in choose lock pattern
...
Test: Manual
Bug: 62225461
Change-Id: I62eb76597f5be7165e0e1047d87d99dbd6f2e33d
2017-05-31 13:30:51 -07:00
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
Doris Ling
d3ba08d957
Add new strings to highlight gestures in settings.
...
- add new title and summary strings for language & input settings.
Bug: 62219660
Test: build
Change-Id: I52a62dad73e2468e7acd3ef47b241cfea6046ad8
2017-05-31 12:59:17 -07: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
jackqdyulei
58575a9803
Update bluetooth strings in settings
...
This cl contains strings used in bluetooth main page and
pairing page
Bug: 35876580
Test: RunSettingsRoboTests
Change-Id: Ied514e50fc2dcf4b5d9ece49159c9e13def1b0f3
2017-05-31 12:19:58 -07: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
Bill Yi
1dac5d5c21
Merge "Import translations. DO NOT MERGE" into oc-dev am: 76e9bd72f9
-s ours
...
am: d8d031701b
-s ours
Change-Id: Ie1d77e8c529ff7409f7169cdeb6c3d7511cd8a0b
2017-05-31 18:59:07 +00: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
Bill Yi
d8d031701b
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 76e9bd72f9
-s ours
Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
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
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
Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
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
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
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