OSDN Git Service
jackqdyulei [Thu, 1 Jun 2017 20:01:42 +0000 (20:01 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev am:
d4991dc24d
am:
42790ccd84 -s ours
Change-Id: I09c4fdc402133470177817ca4fd713c372be2015
TreeHugger Robot [Thu, 1 Jun 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Add search bar to SearchActivity."
TreeHugger Robot [Thu, 1 Jun 2017 19:33:27 +0000 (19:33 +0000)]
Merge "Pass component name into SuggestionFeatureProvider"
jackqdyulei [Thu, 1 Jun 2017 19:05:44 +0000 (19:05 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
am:
d4991dc24d
Change-Id: I4d8bd3099f493497adeb9afe42395225d7fb949c
TreeHugger Robot [Thu, 1 Jun 2017 19:04:06 +0000 (19:04 +0000)]
Merge "Bluetooth string changes"
TreeHugger Robot [Thu, 1 Jun 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Add method to calculate last full charge time" into oc-dev
Andrew Sapperstein [Sun, 28 May 2017 23:28:08 +0000 (16:28 -0700)]
Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.
Removes the action bar and replaces it with a SearchView
inside of a CardView.
Remaining work: pixel pushing
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: I4a0f0c91c51ff5820b61a596520d80a3337c3466
Daniel Nishi [Thu, 1 Jun 2017 17:48:41 +0000 (17:48 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev am:
7035a41715
am:
0a8b12a30a
Change-Id: I3f17e10a9aaf011aee587dbe0e36d18a3a27c42f
Daniel Nishi [Thu, 1 Jun 2017 17:42:55 +0000 (17:42 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
am:
7035a41715
Change-Id: I2c465b9561cea69e5772efd08af7794f762758ca
Daniel Nishi [Thu, 1 Jun 2017 17:30:32 +0000 (17:30 +0000)]
Merge "Fix a bug where cache was double-counted." into oc-dev
Antony Sargent [Thu, 1 Jun 2017 04:23:30 +0000 (21:23 -0700)]
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
TreeHugger Robot [Thu, 1 Jun 2017 17:03:04 +0000 (17:03 +0000)]
Merge "Add search index for support dashboard activity."
TreeHugger Robot [Thu, 1 Jun 2017 08:40:39 +0000 (08:40 +0000)]
Merge "Use a common style for custom preference icon layouts"
Kevin Chyn [Thu, 1 Jun 2017 08:25:07 +0000 (08:25 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev am:
98b67a4e94
am:
618467daff
Change-Id: I78b14e932635fd316fa96fc2cfadcdf9567e724c
Kevin Chyn [Thu, 1 Jun 2017 08:17:06 +0000 (08:17 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
am:
98b67a4e94
Change-Id: Ic3497ccbd63ba4e56ad1923f6b4d082e78c95b70
TreeHugger Robot [Thu, 1 Jun 2017 08:09:51 +0000 (08:09 +0000)]
Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev
TreeHugger Robot [Thu, 1 Jun 2017 07:25:58 +0000 (07:25 +0000)]
Merge "Update bluetooth strings"
TreeHugger Robot [Thu, 1 Jun 2017 07:11:36 +0000 (07:11 +0000)]
Merge "Add method to calculate last full charge time"
TreeHugger Robot [Thu, 1 Jun 2017 06:45:13 +0000 (06:45 +0000)]
Merge "Remove night display headers and change strings"
TreeHugger Robot [Thu, 1 Jun 2017 06:43:21 +0000 (06:43 +0000)]
Merge "Initial search bar implementation."
Daniel Sheng [Thu, 1 Jun 2017 05:39:00 +0000 (05:39 +0000)]
Merge "Added strings for gesture suggestions"
Kevin Chyn [Thu, 1 Jun 2017 00:11:03 +0000 (17:11 -0700)]
Add onResume to FingerprintEnrollEnrolling
Fixes:
62233947
Test: revoke usb permissions, start enrolling, attach usb,
press ok, continue enroll. enroll should be able to continue
and complete
onPause was added in b/
38102355, but onResume was not added. We should
set the listener in onResume()
Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
Fan Zhang [Wed, 31 May 2017 22:40:02 +0000 (15:40 -0700)]
Use a common style for custom preference icon layouts
Change-Id: Ief3bc54f700cb891041adf92846149c6f41caad0
Fix:
35961001
Test: instrumentation test
jackqdyulei [Wed, 31 May 2017 23:17:51 +0000 (16:17 -0700)]
Update bluetooth strings
Update based on new change in doc:
1. revert "visible as" string
2. change "device mac" string
Bug:
35876580
Test: RunSettingsRoboTests
Change-Id: I8950ed3e2e9c000ab25ea0a3d0d15f69fc075fda
Christine Franks [Wed, 31 May 2017 22:54:31 +0000 (22:54 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev am:
9ef166a578
am:
d974ccb625
Change-Id: I8d693fd2d41f73b53416ee83d7b289496765c660
Matthew Fritze [Wed, 31 May 2017 22:52:58 +0000 (22:52 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev am:
564d90faf0
am:
6a50c4555c
Change-Id: Iaf810111f5c4d5e820a0d336eb3029b9474757f3
Christine Franks [Wed, 31 May 2017 22:52:57 +0000 (22:52 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
am:
9ef166a578
Change-Id: I1cc4ed80c31c572b2d091e234c1a41a4dbc9f992
Doris Ling [Wed, 31 May 2017 22:47:54 +0000 (22:47 +0000)]
Merge "Add new strings to highlight gestures in settings."
Christine Franks [Wed, 31 May 2017 22:47:42 +0000 (22:47 +0000)]
Merge "Allow FR in carrier demo mode" into oc-dev
Matthew Fritze [Wed, 31 May 2017 22:47:27 +0000 (22:47 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
am:
564d90faf0
Change-Id: I91993bdbf7de1256fb8149478126ec507833611b
TreeHugger Robot [Wed, 31 May 2017 22:41:22 +0000 (22:41 +0000)]
Merge "Remove dynamic summary from Security Patch info" into oc-dev
Maurice Lam [Wed, 31 May 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Center align icon and title in choose lock pattern"
Andrew Sapperstein [Sun, 28 May 2017 19:20:10 +0000 (12:20 -0700)]
Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.
Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.
Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.
Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).
Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
when there's a condition
Bug:
37477506
Test: make RunSettingsRoboTests
Change-Id: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
TreeHugger Robot [Wed, 31 May 2017 21:46:35 +0000 (21:46 +0000)]
Merge "Add method to disable "disable" button in installed app UI"
TreeHugger Robot [Wed, 31 May 2017 21:39:42 +0000 (21:39 +0000)]
Merge "Update user string for battery"
Fan Zhang [Wed, 31 May 2017 19:43:48 +0000 (12:43 -0700)]
Add search index for support dashboard activity.
Change-Id: Ie9cf20316f94454a3d41f76d05b662e398c2c2ea
Fix:
36005923
Test: make RunSettingsRoboTests
TreeHugger Robot [Wed, 31 May 2017 21:14:30 +0000 (21:14 +0000)]
Merge "Update bluetooth strings in settings"
Daniel Sheng [Wed, 31 May 2017 19:16:56 +0000 (12:16 -0700)]
Added strings for gesture suggestions
Bug:
62225100
Test: N/A
Change-Id: I77a328746782a02df7a33c720b4d8f2a193419b3
Maurice Lam [Wed, 31 May 2017 20:30:51 +0000 (13:30 -0700)]
Center align icon and title in choose lock pattern
Test: Manual
Bug:
62225461
Change-Id: I62eb76597f5be7165e0e1047d87d99dbd6f2e33d
Joe Onorato [Wed, 31 May 2017 20:06:05 +0000 (20:06 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev am:
37eb1c580b
am:
98952ced4f
Change-Id: I14df97cb60643605ae0f34642aedc91abb68c475
Doris Ling [Wed, 31 May 2017 18:59:20 +0000 (11:59 -0700)]
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
Joe Onorato [Wed, 31 May 2017 19:50:03 +0000 (19:50 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
am:
37eb1c580b
Change-Id: Ia794a4e1d51a6a0a28b65f9ade1530ca2c79cf90
TreeHugger Robot [Wed, 31 May 2017 19:32:32 +0000 (19:32 +0000)]
Merge "Update updateEmptyView"
Joe Onorato [Wed, 31 May 2017 19:26:45 +0000 (19:26 +0000)]
Merge "Add unoptimized ble scans to batterystats." into oc-dev
jackqdyulei [Fri, 26 May 2017 21:38:08 +0000 (14:38 -0700)]
Update bluetooth strings in settings
This cl contains strings used in bluetooth main page and
pairing page
Bug:
35876580
Test: RunSettingsRoboTests
Change-Id: Ied514e50fc2dcf4b5d9ece49159c9e13def1b0f3
TreeHugger Robot [Wed, 31 May 2017 19:09:35 +0000 (19:09 +0000)]
Merge "Update summary for Hotspot & Tethering."
Christine Franks [Sat, 27 May 2017 01:23:38 +0000 (18:23 -0700)]
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
Christine Franks [Thu, 25 May 2017 23:22:00 +0000 (16:22 -0700)]
Remove night display headers and change strings
Bug:
38362741
Test: manual - looks like what was expected
Change-Id: Ied5ebd2b13a23e799488a476cc08d8f5db4c9ff5
Bill Yi [Wed, 31 May 2017 18:59:07 +0000 (18:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
76e9bd72f9 -s ours
am:
d8d031701b -s ours
Change-Id: Ie1d77e8c529ff7409f7169cdeb6c3d7511cd8a0b
Fan Zhang [Wed, 31 May 2017 17:42:19 +0000 (10:42 -0700)]
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
Bill Yi [Wed, 31 May 2017 18:36:26 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
76e9bd72f9 -s ours
Change-Id: Iba41564e3e6efc69724c8da69663bbe93c0b358f
TreeHugger Robot [Wed, 31 May 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 31 May 2017 18:05:15 +0000 (18:05 +0000)]
Merge "Import translations. DO NOT MERGE"
Daniel Nishi [Wed, 31 May 2017 17:59:04 +0000 (10:59 -0700)]
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
Matthew Fritze [Wed, 31 May 2017 16:38:02 +0000 (09:38 -0700)]
Remove dynamic summary from Security Patch info
Change-Id: I96b2e32a101077c58efd56115e70b63e4eb25049
Fixes:
36101902
Test: builds :)
Jeff Sharkey [Wed, 31 May 2017 15:07:18 +0000 (15:07 +0000)]
Jeff Sharkey [Wed, 31 May 2017 15:05:30 +0000 (09:05 -0600)]
Merge commit '
47eec246a9293616cb74d2c354be85201ec4e19e' into mergeit
Change-Id: I988ae328e0e9bb99b086490cf2ef48ca19779d13
TreeHugger Robot [Wed, 31 May 2017 14:55:30 +0000 (14:55 +0000)]
Merge "Add related assist-gesture keywords"
Jeff Sharkey [Wed, 31 May 2017 14:48:43 +0000 (14:48 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
am:
552e3c4dba
Change-Id: I70e8a1aac274f6a96626272127d5dab060e10966
Bill Yi [Wed, 31 May 2017 14:24:59 +0000 (07:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26a4e18c3186ee2388da40e2bf1232314f944813
Auto-generated-cl: translation import
Jeff Sharkey [Wed, 31 May 2017 14:18:24 +0000 (14:18 +0000)]
Merge "Consistent "low storage" behavior." into oc-dev
Bill Yi [Wed, 31 May 2017 14:12:21 +0000 (07:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f6a0cc72995cb233ea7390a862c2ca8ff748751
Auto-generated-cl: translation import
Esteban Talavera [Wed, 31 May 2017 12:09:31 +0000 (12:09 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev am:
535533680f
am:
112f8d88fd
Change-Id: I23d0ee4977fc544b35723512977670cd2686c7d1
Esteban Talavera [Wed, 31 May 2017 12:04:57 +0000 (12:04 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
am:
535533680f
Change-Id: I9058ae475e16c3b3c3227aa979af78c8958d0628
TreeHugger Robot [Wed, 31 May 2017 11:58:38 +0000 (11:58 +0000)]
Merge "Launchers that don't support managed profiles cannot be selected" into oc-dev
Jeff Sharkey [Tue, 30 May 2017 20:39:14 +0000 (14:39 -0600)]
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
Adrian Roos [Wed, 31 May 2017 04:33:33 +0000 (04:33 +0000)]
Merge "Credential FRP: Add ACTION_CONFIRM_FRP_CREDENTIAL to ConfirmCredential"
Adrian Roos [Wed, 31 May 2017 04:25:38 +0000 (04:25 +0000)]
Merge "AOD: Ambient display settings to dedicated settings screen"
TreeHugger Robot [Wed, 31 May 2017 03:48:56 +0000 (03:48 +0000)]
Merge "Change header in choose lock password"
TreeHugger Robot [Wed, 31 May 2017 03:36:15 +0000 (03:36 +0000)]
Merge "Bluetooth: Enable in-band ringing by default (1/2)"
TreeHugger Robot [Wed, 31 May 2017 03:35:35 +0000 (03:35 +0000)]
Merge "Resize fingerprint added illustration to specs"
TreeHugger Robot [Wed, 31 May 2017 02:22:04 +0000 (02:22 +0000)]
Merge "AccountTypePreference layout clean up."
TreeHugger Robot [Wed, 31 May 2017 02:13:59 +0000 (02:13 +0000)]
Merge "Revert "Revert "Share preference controller in AdavancedAppSettings search"""
Adrian Roos [Fri, 31 Mar 2017 01:02:25 +0000 (18:02 -0700)]
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
Hugo Benichi [Wed, 31 May 2017 00:47:54 +0000 (00:47 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev am:
0c5573a0e3
am:
5716f6cc7e
Change-Id: Ifb6f4a26fbbcd356f7fc0ff25c552cdd9da5c73d
Fan Zhang [Wed, 31 May 2017 00:43:18 +0000 (00:43 +0000)]
Revert "Revert "Share preference controller in AdavancedAppSettings search""
Bug:
62141436
Test: make RunSettingsRoboTests -j40
This reverts commit
b2676a769eaad4a24544e341f9a912620fc3cc9e.
Change-Id: I27c8df94a3103602d2e176670bcf1f82528e70c0
Fan Zhang [Wed, 31 May 2017 00:42:52 +0000 (00:42 +0000)]
Merge "Revert "Share preference controller in AdavancedAppSettings search""
Fan Zhang [Wed, 31 May 2017 00:42:22 +0000 (00:42 +0000)]
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
3541f597a429cd88846c131a327faa21833d7740.
Change-Id: Id4bc0ba2d5995092c625a54fa415ff0c2c6785cb
Doris Ling [Wed, 31 May 2017 00:28:06 +0000 (17:28 -0700)]
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
Hugo Benichi [Wed, 31 May 2017 00:27:43 +0000 (00:27 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
am:
0c5573a0e3
Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
Hugo Benichi [Wed, 31 May 2017 00:16:41 +0000 (00:16 +0000)]
Merge "Wifi details page: sign-in uses primary color" into oc-dev
Adrian Roos [Thu, 25 May 2017 22:49:35 +0000 (15:49 -0700)]
AOD: Ambient display settings to dedicated settings screen
Bug:
33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
Suprabh Shukla [Tue, 30 May 2017 23:20:08 +0000 (23:20 +0000)]
Merge "Disabling the activate button when paused" into oc-dev am:
dacdcb9b42
am:
04c93c6628
Change-Id: Idad6231a35a90b401651effd59123a647985336f
TreeHugger Robot [Tue, 30 May 2017 23:12:18 +0000 (23:12 +0000)]
Merge "Add string needed by new device suggestion"
Suprabh Shukla [Tue, 30 May 2017 23:12:10 +0000 (23:12 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
am:
dacdcb9b42
Change-Id: Ia9033892369078556d1874fe9fe4b46f4d2bf5a5
jackqdyulei [Tue, 30 May 2017 23:02:33 +0000 (16:02 -0700)]
Update user string for battery
Bug:
37293179
Test: Build
Change-Id: I6589d51e12a59622a8773c808e1c365880921cae
Suprabh Shukla [Tue, 30 May 2017 23:02:09 +0000 (23:02 +0000)]
Merge "Disabling the activate button when paused" into oc-dev
jackqdyulei [Thu, 25 May 2017 22:26:03 +0000 (15:26 -0700)]
Add method to calculate last full charge time
Bug:
38481300
Test: RunSettingsRoboTests
Change-Id: Icd551921f263352eb01d0c6ada62d277c8699507
Jack He [Tue, 30 May 2017 22:17:33 +0000 (15:17 -0700)]
Bluetooth: Enable in-band ringing by default (1/2)
Bug:
19171297
Test: make, make calls, HFP regression
Change-Id: Id1d44e07a939d121ccf05466239d3cb5cc4b3199
Rebecca Silberstein [Tue, 30 May 2017 22:11:21 +0000 (22:11 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev am:
bbc260d408
am:
cba166d380
Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd
Phil Weaver [Tue, 30 May 2017 22:10:53 +0000 (22:10 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev am:
7348c5c91b
am:
91df0c9a03 -s ours
Change-Id: I683f75c1b25b74d060c8ad0dc89063dc1f303eba
Rebecca Silberstein [Tue, 30 May 2017 22:02:18 +0000 (22:02 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am:
bbc260d408
Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d
Phil Weaver [Tue, 30 May 2017 22:01:40 +0000 (22:01 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
am:
7348c5c91b
Change-Id: I3244c4cd41919e691641f9696f1f2c24f3c07bcd
Fan Zhang [Tue, 30 May 2017 21:50:08 +0000 (14:50 -0700)]
AccountTypePreference layout clean up.
Bug:
35961001
Test: visual
Change-Id: Iaeb605e7eed0d75a77d893f6b849e26482311b08
Rebecca Silberstein [Tue, 30 May 2017 21:48:36 +0000 (21:48 +0000)]
Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
Phil Weaver [Tue, 30 May 2017 21:45:36 +0000 (21:45 +0000)]
Merge "Fix clickjacking again for accessibility services" into oc-dev
TreeHugger Robot [Tue, 30 May 2017 21:41:55 +0000 (21:41 +0000)]
Merge "Share preference controller in AdavancedAppSettings search"
Fan Zhang [Tue, 30 May 2017 21:24:10 +0000 (14:24 -0700)]
Add string needed by new device suggestion
Bug:
62034077
Test: builds
Change-Id: I9059d3507017a1f1ea5b7b0a412834194bffd309
Matthew Fritze [Tue, 30 May 2017 20:51:00 +0000 (20:51 +0000)]
Merge "Location summary is no longer indexed" into oc-dev am:
fed6e817a5
am:
53c8d6c2b2
Change-Id: I81c15d76c260969bb53a0c9462db3fabbb31f6cb
TreeHugger Robot [Tue, 30 May 2017 20:48:13 +0000 (20:48 +0000)]
Merge "Extend single line summary preference to multi line."