OSDN Git Service
Maurice Lam [Thu, 11 May 2017 17:35:16 +0000 (17:35 +0000)]
Merge "Check for sidecar null-ness before removing" into oc-dev
TreeHugger Robot [Thu, 11 May 2017 00:30:30 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Maurice Lam [Tue, 9 May 2017 04:43:02 +0000 (21:43 -0700)]
Check for sidecar null-ness before removing
Test: cd tests/robotests && mma
Bug:
36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 23:39:52 +0000 (23:39 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
Bill Yi [Wed, 10 May 2017 20:48:13 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 May 2017 20:47:28 +0000 (20:47 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 19:54:53 +0000 (12:54 -0700)]
Set textDirection of app name to locale direction
Test: Manual
Fixes:
37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
Doris Ling [Tue, 2 May 2017 18:28:14 +0000 (11:28 -0700)]
Also update the account preferences in displayPreference().
- start creating the account preferences in displayPreference() to make
the data available earlier.
- when trying to update the UI when the page is resumed, instead of
clearing the whole list and add the latest accounts, compare the
differences between the currently shown accounts and the latest accounts
and only update the account preferences that has been changed.
Change-Id: I249eb2fe67f4adaab02bf77680c62d07756dc94a
Fix:
34035653
Test: make RunSettingsRoboTests
Alison Cichowlas [Wed, 10 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
Alison Cichowlas [Tue, 9 May 2017 18:01:42 +0000 (14:01 -0400)]
Notifications settings updates to match spec:
- change badge language & remove summary
- change caps on sound text
Bug:
37479730,
37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
Matthew Fritze [Wed, 3 May 2017 01:43:31 +0000 (18:43 -0700)]
Only add icons to settings items with icons
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug:
37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
Stephen Chen [Tue, 9 May 2017 19:50:42 +0000 (12:50 -0700)]
Update Wi-Fi Wakeup setting to check whether the feature is available.
Bug:
38037361
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I1c1b930546cc090d72f3047058a428acd1b2883a
Daniel Nishi [Wed, 10 May 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix the top summary layout." into oc-dev
Daniel Nishi [Wed, 10 May 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 05:07:52 +0000 (05:07 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 02:57:18 +0000 (02:57 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
Fan Zhang [Wed, 10 May 2017 00:44:49 +0000 (17:44 -0700)]
Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix:
38011653
Test: visual
TreeHugger Robot [Tue, 9 May 2017 19:59:58 +0000 (19:59 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 18:25:53 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Matthew Fritze [Fri, 5 May 2017 18:05:53 +0000 (11:05 -0700)]
Prevent non-blocking whitespaces from showing up in search
When search results use the placeholder summary text,
it becomes non-breaking whitespace. If that is the
summary, set the visibility to gone.
Change-Id: Ic3987a0990c33b6cc5aabffa0782ece6c553784a
Merged-In: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Fixes:
38029215
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 9 May 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
Bill Yi [Tue, 9 May 2017 11:07:09 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 9 May 2017 01:25:16 +0000 (01:25 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
Daniel Nishi [Tue, 9 May 2017 00:01:11 +0000 (17:01 -0700)]
Fix the top summary layout.
This changes the margin to the proper 32dp and updates the style on the
title text to be consistent with the rest of Settings.
Bug:
35245772
Test: Manual
Change-Id: Ib980e22d9fac258dd5a72385a2c80060561aa5ac
TreeHugger Robot [Mon, 8 May 2017 23:39:21 +0000 (23:39 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 22:58:55 +0000 (22:58 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
Jesse Evans [Mon, 8 May 2017 22:53:47 +0000 (15:53 -0700)]
Properly set isInstantApp for power usage page
Previously the app header was not properly configured to be aware
it was rendering an instant app. This change properly sets the value
and adds tests to ensure it is correclty set in the future.
Test: make RunSettingsRoboTests -j30
Bug:
37919863
Change-Id: I0cbe2cb03bcd44208408f68188387e53ae98d8fb
Doris Ling [Mon, 8 May 2017 22:08:58 +0000 (15:08 -0700)]
Fix crash when silencing condition.
- check if the broadcast receiver is being registered before trying to
un-regist it.
Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix:
38131851
Test: make RunSettingsRoboTests
Stephen Chen [Mon, 1 May 2017 21:40:19 +0000 (14:40 -0700)]
Added WifiSettings Espresso tests.
Added test cases for toggling Wi-Fi state, connected access points, and
saved network preferences.
Bug:
35322629
Bug:
35322690
Bug:
35322875
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Iaba7fb2fa90cf0f37538c4b1ef141cf6b15d7f52
Daniel Nishi [Mon, 8 May 2017 21:13:13 +0000 (14:13 -0700)]
Add the badged icon for Movies & TV.
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes:
38132211
Test: Settings robotest
TreeHugger Robot [Mon, 8 May 2017 20:51:03 +0000 (20:51 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
Fan Zhang [Mon, 8 May 2017 20:15:58 +0000 (13:15 -0700)]
Remove placeholder summary text in auto-rotate preference
- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
master but we don't want to cherry-pick the master change because of its
size and risk.
Bug:
36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fan Zhang [Fri, 5 May 2017 16:19:13 +0000 (09:19 -0700)]
Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix:
38011653
Test: visual
TreeHugger Robot [Mon, 8 May 2017 18:57:56 +0000 (18:57 +0000)]
Merge "Remove summary template in sleep timeout setting." into oc-dev
Svetoslav Ganov [Mon, 8 May 2017 18:57:22 +0000 (18:57 +0000)]
Merge "Report normalized package name as default key" into oc-dev
Svet Ganov [Sat, 6 May 2017 22:49:27 +0000 (15:49 -0700)]
Report normalized package name as default key
Test: make RunSettingsRoboTests -j90
bug:
36978445
Change-Id: I593de89c4fa4e9c63a86b9844736e38dce30a258
Matthew Fritze [Tue, 25 Apr 2017 16:38:56 +0000 (09:38 -0700)]
Prevent race conditions after dropping database
Block all loaders from accessing the database
before indexing is complete.
Bug:
37501479
Test: make RunSettingsRoboTests
Change-Id: I2af98dcf6bceacbeffa70bd40879c97bb0cbc828
Merged-In: I02f8423c0ffc27abbb8ceb61a8c47d2f0796d0bb
Matthew Fritze [Mon, 17 Apr 2017 14:55:41 +0000 (07:55 -0700)]
Remove accessibility duplicates in settings search
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
TreeHugger Robot [Mon, 8 May 2017 17:07:32 +0000 (17:07 +0000)]
Merge "Show "Forget" button for ephemeral networks." into oc-dev
Daniel Nishi [Mon, 8 May 2017 16:45:06 +0000 (16:45 +0000)]
Merge "Fix Settings crash in Storage settings." into oc-dev
TreeHugger Robot [Sat, 6 May 2017 02:42:37 +0000 (02:42 +0000)]
Merge "Fix crash when there is no emergencybroadcast app on device" into oc-dev
TreeHugger Robot [Sat, 6 May 2017 01:34:46 +0000 (01:34 +0000)]
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
Fan Zhang [Fri, 5 May 2017 22:03:19 +0000 (15:03 -0700)]
Fix crash when there is no emergencybroadcast app on device
Some devices do not have emergencybroadcast app installed, so we should
not show the preference item for it. Add the preference controller into
AppAndNotificationFragment properly hides it.
Change-Id: Ic39ba24da9bd8f3200a5e44232a5489e35c48c0a
Fix:
37945069
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 23:59:27 +0000 (23:59 +0000)]
Merge "Fix crash when primary user select app installed by secondary user." into oc-dev
Doris Ling [Wed, 3 May 2017 23:22:40 +0000 (16:22 -0700)]
Fix crash when primary user select app installed by secondary user.
- PackageManager.getPackageInfo() can return null. When trying to check
the app permission info, check for null package info and only process
the permission info when package info is available.
- Update usage of PackageManager.MATCH_UNINSTALLED_PACKAGES to
PackageManager.MATCH_ANY_USER, as the implementation for querying
packages for other users have been changed.
- Add PackageManager APIs used by AppStateAppOpsBridge to
IPackageManagerWrapper for test purpose.
- Change UserManager.get() to Context.getSystemService() to fix test
failure.
Change-Id: I52de924618aa252ffaae02b8f06ebe5b1d0def61
Fix:
37409266
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 21:52:06 +0000 (21:52 +0000)]
Merge "Update tether summary text when airplane mode turns on" into oc-dev
TreeHugger Robot [Fri, 5 May 2017 20:48:41 +0000 (20:48 +0000)]
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
Fan Zhang [Fri, 5 May 2017 17:19:52 +0000 (10:19 -0700)]
Remove summary template in sleep timeout setting.
The template causes incorrect display in search, and it's not
needded by anyone in code.
Bug:
36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
Roozbeh Pournader [Fri, 5 May 2017 20:40:05 +0000 (13:40 -0700)]
Fix bidi direction of dialog and bidi-wrap service name
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.
Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.
Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes:
37761152
Fan Zhang [Thu, 4 May 2017 16:12:12 +0000 (09:12 -0700)]
Update tether summary text when airplane mode turns on
Change-Id: I62c52351abbad50aeac077785afb21822773956e
Fix:
37934871
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 5 May 2017 18:55:27 +0000 (18:55 +0000)]
Merge "Only use PROCESS_STATE_TOP as foreground time." into oc-dev
jackqdyulei [Thu, 4 May 2017 19:38:08 +0000 (12:38 -0700)]
Only use PROCESS_STATE_TOP as foreground time.
There are some miscalculations in state FOREGROUND_SERVICE and
FOREGROUND, so we move them out of the foreground time for now.
We will fix it after O and may add them back later.
Bug:
37000096
Test: RunSettingsRoboTests
Change-Id: Ic3f2f7fa69e8a213895c601630d1cca94fd32220
TreeHugger Robot [Fri, 5 May 2017 11:58:05 +0000 (11:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 5 May 2017 06:26:52 +0000 (23:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 5 May 2017 02:21:10 +0000 (02:21 +0000)]
Merge "Defend against underspecified notifications." into oc-dev
Suprabh Shukla [Wed, 3 May 2017 01:06:16 +0000 (18:06 -0700)]
Adding SecureTouchListener to DeviceAdminAdd
Dropping any touches to the activate admin button if any other
window is partly or wholly obscuring the device admin add window
Test: Cts Verifier -> Device Administration -> Device Admin Tapjacking
Test
Bug:
35056974
Change-Id: I048ecc1944c13fea624eede7861d39df2beeb393
Ajay Panicker [Thu, 4 May 2017 22:56:16 +0000 (22:56 +0000)]
Merge "Limit btsnoop file size (4/9)" into oc-dev
Daniel Nishi [Wed, 3 May 2017 20:36:36 +0000 (13:36 -0700)]
Fix Settings crash in Storage settings.
If you tap aggressively before the fragment has fully initialized, it
was possible to NPE. This null-checks to avoid this.
Change-Id: I3488245d230cf1e16b23e34614c8e6b43ea14ff1
Fixes:
37945253
Test: Robotest
Julia Reynolds [Thu, 4 May 2017 20:08:38 +0000 (20:08 +0000)]
Merge "Only show one copy of each preference" into oc-dev
Doris Ling [Thu, 4 May 2017 19:35:31 +0000 (12:35 -0700)]
Add summary placeholder to data saver preference.
- reserve 2 lines for the data saver summary to avoid the preference
beging relayout when the summary text get updates.
Change-Id: Ibced7dc4b9620fe45541ea470d34bf83be66480d
Fix:
37925232
Test: visual
Daniel Nishi [Thu, 4 May 2017 17:18:35 +0000 (17:18 +0000)]
Merge "Fix a bug where override filter was always on." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Show when work profile notifications are blocked for listener" into oc-dev
Fan Zhang [Thu, 4 May 2017 16:12:25 +0000 (16:12 +0000)]
Merge "Skip "null" string when building advanced button summary" into oc-dev
Julia Reynolds [Thu, 4 May 2017 14:10:22 +0000 (10:10 -0400)]
Only show one copy of each preference
Fixes:
37912144
Fixes:
37909560
Test: manual, load app settings for legacy and upgrade apps from
inline settings, click (i), and click back.
Change-Id: Ieb96cca03f2596fd44cd33facafa3d4af1fbc24d
Esteban Talavera [Wed, 5 Apr 2017 15:31:10 +0000 (16:31 +0100)]
Show when work profile notifications are blocked for listener
Bug:
36657192
Test: m RunSettingsRoboTests
Change-Id: If6a8715b9a5a9ea893728c8ce7708e4c4154fb80
(cherry picked from commit
ee349792dd4d34bbbdc10446c88ce5f370d5347c)
Amin Shaikh [Tue, 2 May 2017 23:33:37 +0000 (16:33 -0700)]
Show "Forget" button for ephemeral networks.
- Move forget button preference handling logic to
WifiDetailPreferenceController
- Remove unnecessary updateInfo call in onResume since
NETWORK_STATE_CHANGED_ACTION is a sticky broadcast
- Populate network state fields and set up initial wifi state
when the Preference is displayed instead of waiting for onResume
Bug:
37751816
Test: m RunSettingsRoboTests && manually tested on device
Change-Id: I509013c72a0d26fc9a3feca564d92a0ab8414d1e
TreeHugger Robot [Thu, 4 May 2017 02:23:17 +0000 (02:23 +0000)]
Merge "Fix string where it says "phone" on a tablet." into oc-dev
Lorenzo Colitti [Thu, 4 May 2017 02:06:48 +0000 (02:06 +0000)]
Merge "Add a "sign into network" button to the wifi details page." into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:11:23 +0000 (01:11 +0000)]
Merge "Update "Phone idle" subtext" into oc-dev
TreeHugger Robot [Thu, 4 May 2017 01:04:49 +0000 (01:04 +0000)]
Merge "Fix null pointer exception in wifi settings" into oc-dev
Daniel Nishi [Wed, 3 May 2017 21:14:56 +0000 (14:14 -0700)]
Fix a bug where override filter was always on.
Change-Id: I1df52f13d8e335362d2eec18c968227ed9ecf299
Fixes:
37952170
Test: Settings unit test
Fan Zhang [Thu, 4 May 2017 00:03:55 +0000 (17:03 -0700)]
Fix string where it says "phone" on a tablet.
Change-Id: Id2e8fa1e1fef34e167c7ad25468dcd335baa73c6
Fix:
37833383
Test: visual
TreeHugger Robot [Wed, 3 May 2017 22:57:07 +0000 (22:57 +0000)]
Merge "Allow "None" to be selected as a Network rating provider." into oc-dev
Glen Kuhne [Tue, 2 May 2017 19:11:28 +0000 (12:11 -0700)]
Fix null pointer exception in wifi settings
Fixes a null pointer exception that can occur during setup wizard.
Bug:
37873425
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I40de883fae6ccde13ad264f9b8b2d9da9745eb24
jackqdyulei [Wed, 3 May 2017 18:23:33 +0000 (11:23 -0700)]
Update "Phone idle" subtext
Bug:
37897135
Test: RunSettingsRoboTests
Change-Id: I38a63ef9fdf574ba277ed889e7e070c36ae14b01
Fan Zhang [Wed, 3 May 2017 17:26:23 +0000 (10:26 -0700)]
Skip "null" string when building advanced button summary
- Also added help string to SoundSettings as a side fix.
Change-Id: Ia81a46c6e199b72b52ae1fa9d996c094193b506c
Fix:
37933524
Test: robotests
Daniel Nishi [Wed, 3 May 2017 18:00:18 +0000 (18:00 +0000)]
Merge "Always use GB as the unit in Storage Settings." into oc-dev
Daniel Nishi [Wed, 3 May 2017 17:59:06 +0000 (17:59 +0000)]
Merge "Don't overly hide the Files preference." into oc-dev
Dan Sandler [Tue, 2 May 2017 00:14:40 +0000 (20:14 -0400)]
Defend against underspecified notifications.
While we're here, show the channelId and other O features of
notifications in the extra text.
(Also make a halfhearted attempt to keep an expanded
notification open while other notifications are updating.)
Bug:
37646836
Test: none
Change-Id: I1b34ae9aaeb0af1e9f993354cebef8644050bed2
Lorenzo Colitti [Wed, 26 Apr 2017 15:56:39 +0000 (00:56 +0900)]
Add a "sign into network" button to the wifi details page.
Bug:
36203355
Test: manually signed into captive portal
Test: make -j64 RunSettingsRoboTests
Change-Id: I3242ef30125ddfdaaac9b80ead4f8ac14ea6d364
TreeHugger Robot [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Hide subtitle for wifi and bluetooth" into oc-dev
Stephen Chen [Tue, 2 May 2017 21:18:26 +0000 (14:18 -0700)]
Fix Disallow config Wi-Fi message for AFW Do mode.
Correctly displays the custom message set by the Test DPC tool
for devices in AFW Do mode.
This change also fixes an issue where when Wi-Fi is disabled, the
disabled message is not shown instantly on Settings app start.
Bug:
37134344
Bug:
37911257
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
for off message testing, manual inspection using the Test DPC tool, and
verifying Guest mode behavior.
Change-Id: I61e48f605d75cb5665461536beeedcb32f6aa7f9
Daniel Nishi [Mon, 1 May 2017 18:30:14 +0000 (11:30 -0700)]
Don't overly hide the Files preference.
This occurred this because the files preference was initialized during
displayPreference(), but the volume used to initialize it was not being
set until after the displayPreference() call. In this case, the files
preference would hide itself and never come back.
This fixes this by double-checking the Files visibility status whenever
we set the volume.
Change-Id: I0b1a7a9566e9caece39ec58706fbca034ef4c1c2
Fixes:
37790776
Test: Settings robotest
jackqdyulei [Tue, 2 May 2017 22:16:19 +0000 (15:16 -0700)]
Hide subtitle for wifi and bluetooth
Hide it for now because the usage time is not accurate. We may
revisit it in the future.
Bug:
37912143
Test: RunSettingsRoboTests
Change-Id: I37b9dca6a188f2973a7a83641d12b24001d629ae
TreeHugger Robot [Tue, 2 May 2017 19:25:52 +0000 (19:25 +0000)]
Merge "Prevent empty non-Indexable keys from being added" into oc-dev
Matthew Fritze [Mon, 24 Apr 2017 23:32:52 +0000 (16:32 -0700)]
Prevent empty non-Indexable keys from being added
Change-Id: I688cd5243bb1651d60f74e168a84ddf8723816e3
Fixes:
37646265
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 2 May 2017 17:12:20 +0000 (17:12 +0000)]
Merge "Revert "Swipe for notification should be default-on in settings app"" into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:36 +0000 (17:03 +0000)]
Merge "Filter on volume for category storage view." into oc-dev
Daniel Nishi [Tue, 2 May 2017 17:03:12 +0000 (17:03 +0000)]
Merge "Tweak spacing for horizontal preferences." into oc-dev
Jeremy Joslin [Fri, 28 Apr 2017 23:40:51 +0000 (16:40 -0700)]
Allow "None" to be selected as a Network rating provider.
Updated the picker to always provide "None" as an option. The
preference is only disabled if there a no valid scorers installed.
Existing tests updated and new tests added.
Bug:
37722313
Test: make RunSettingsRoboTests -j40
Test: manual on device clicking.
Change-Id: Ie6fd9f29e0ea3c64845dd98ce1d117013f50c86b
TreeHugger Robot [Tue, 2 May 2017 15:46:54 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
The Android Open Source Project [Tue, 2 May 2017 09:06:19 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: I821c1fc2cd75b141b068160f0a664cc747c36a3f
Auto-generated-cl: translation import
Kevin Chyn [Tue, 2 May 2017 04:23:31 +0000 (04:23 +0000)]
Revert "Swipe for notification should be default-on in settings app"
This reverts commit
a95c2c3a8d65d191260d4948a54eee1c74dac3fa.
Change-Id: I8fcc290be7d373d55058bd7c22f163d54fc03830
TreeHugger Robot [Tue, 2 May 2017 04:09:30 +0000 (04:09 +0000)]
Merge "Swipe for notification should be default-on in settings app" into oc-dev