Commit Graph

1430 Commits

Author SHA1 Message Date
Youhan Wang
1bceb954ed Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev am: 350ba4a4c3
am: c6b1845d0f

Change-Id: I3bee5b3a1e90a7f8766b875045a54a9945264226
2017-05-17 23:46:20 +00:00
Youhan Wang
350ba4a4c3 Merge "TelephonyMonitor: Replace boolean decision with multiple status." into oc-dev 2017-05-17 23:38:08 +00:00
Lei Yu
868ecae66d Merge "Add AnomalyDetectionPolicy" 2017-05-17 21:10:30 +00:00
Antony Sargent
3033c1a2cf Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev am: c439202da9
am: 3afb6616c6

Change-Id: I37280e12b32047ddef316be763f69b5ff648b557
2017-05-17 19:41:16 +00:00
Matthew Fritze
c838e959f7 Merge "Remove duplicates from sound settings" into oc-dev am: 3abeba07d3
am: a939959838

Change-Id: I0260cf2a7dd9d54b700387d0d82f58a7c6a3263c
2017-05-17 19:07:45 +00:00
Matthew Fritze
8cd0562bd6 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce
am: af054e63e0

Change-Id: I35667061a61fd66e8ab8acafccffb53f00f15149
2017-05-17 19:06:59 +00:00
TreeHugger Robot
c439202da9 Merge "Add a "Use high quality audio" option to Bluetooth A2DP device settings" into oc-dev 2017-05-17 18:59:54 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Matthew Fritze
256e9e208e Merge "Remove Network Restrictions duplicate from setting search" into oc-dev am: 09dbc8043f
am: d53409356d

Change-Id: Ia40375afa74f82a46c01aef99b95d6074fbc5324
2017-05-17 17:53:08 +00:00
Matthew Fritze
f81f1024c3 Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b
am: 70db53a8d5

Change-Id: I03de10d23f3d9a74ee08fdb6a711400e3e0468cf
2017-05-17 17:31:08 +00:00
TreeHugger Robot
09dbc8043f Merge "Remove Network Restrictions duplicate from setting search" into oc-dev 2017-05-17 17:27:57 +00:00
Matthew Fritze
dffaa57cb1 Merge "Remove default app duplicates in search" into oc-dev am: 0c55014b88
am: 79cfaa7b91

Change-Id: I1beb3569054d6acbcd9f22d112031de51b862dc9
2017-05-17 17:17:37 +00:00
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +00:00
Matthew Fritze
4704356bfb Merge "Remove Wallpaper duplicate from setting search" into oc-dev am: 564b965ccc
am: 5a151d23ab

Change-Id: If022852ca522b4d3f2fc8a01a9e96b966ab98cfa
2017-05-17 17:16:47 +00:00
TreeHugger Robot
0c55014b88 Merge "Remove default app duplicates in search" into oc-dev 2017-05-17 17:08:12 +00:00
TreeHugger Robot
564b965ccc Merge "Remove Wallpaper duplicate from setting search" into oc-dev 2017-05-17 17:06:18 +00:00
Matthew Fritze
2d6c7df80b Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev am: bcb2565e05
am: f8b8ecebea

Change-Id: I4ae1d981c928e1b61d555d129723b7dabafd439c
2017-05-17 04:48:50 +00:00
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Youhan Wang
c426fe6c68 TelephonyMonitor: Replace boolean decision with multiple status.
Test: make ROBOTEST_FILTER=TelephonyMonitorPreferenceControllerTest
RunSettingsRoboTests -j40

Use enable, disable, user_enable, user_disable four statuses to
replace the old boolean value,

Bug:36704500
Change-Id: I5d3fd36aecaf36bb6969a6f6354c85bb162a0293
2017-05-17 01:11:53 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
61c80c2ab6 Merge "Remove Special App Access duplicate from Setting search" into oc-dev am: d6aa9f3454
am: c6192251b2

Change-Id: Ia442b29148675a291aca2b317c398bf285b3a2eb
2017-05-16 22:53:37 +00:00
Matthew Fritze
6fe35bb031 Remove Backup and Reset duplicates from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
d6aa9f3454 Merge "Remove Special App Access duplicate from Setting search" into oc-dev 2017-05-16 22:37:22 +00:00
Matthew Fritze
8b0ed39c11 Remove Network Restrictions duplicate from setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I6b1aef6102811a6ad25d2da43993441c6e56006c
2017-05-16 14:35:19 -07:00
jackqdyulei
9db95a35ba Add AnomalyDetectionPolicy
AnomalyDetectionPolicy contains all the knobs for anomaly detection.

Since Robolectric doesn't support KeyValueListParser, this cl creates
KeyValueListParserWrapper so we could mock it and test
AnomalyDetectionPolicy

Bug: 36924669
Test: RunSettingsRoboTests
Change-Id: I71138f85d37a21b5c4c9c806a41e00a4aa924f5f
2017-05-16 13:09:36 -07:00
Antony Sargent
f1d544f945 Add a "Use high quality audio" option to Bluetooth A2DP device settings
This change adds a checkbox reading "Use high quality audio: <codec
name>" to the details dialog for A2DP audio bluetooth devices that
support codecs other than the mandatory SBC (eg AAC, LDAC, aptX, etc.).

Bug: 37441685
Test: make RunSettingsRoboTests

Change-Id: I6e5423db11a0cd7fe0b1141dd998e7c936c240f0
2017-05-16 11:02:52 -07:00
Shinji Sogo
b8548f762c Merge "Show security info in saved network list" into oc-dev am: ecd1df1076
am: 183aed6dd6

Change-Id: Ib479ee98d5c6500954e5dede317f46c19bc2aca6
2017-05-16 15:39:57 +00:00
TreeHugger Robot
ecd1df1076 Merge "Show security info in saved network list" into oc-dev 2017-05-16 15:25:53 +00:00
Matthew Fritze
5a44fe4dad Merge "Replace dynamic summary text for SettingPref" into oc-dev am: 49b86b5c6a
am: 1f21e7f325

Change-Id: Ie231837dc4ae0f4f94f326f67c06dfc2eb79ce4e
2017-05-16 01:56:55 +00:00
TreeHugger Robot
49b86b5c6a Merge "Replace dynamic summary text for SettingPref" into oc-dev 2017-05-15 23:46:18 +00:00
TreeHugger Robot
5362bb2222 Merge "Code inspector test clean up." 2017-05-15 23:33:05 +00:00
TreeHugger Robot
96d05ef43a Merge "Update strings in special app access and dev options" 2017-05-15 22:23:02 +00:00
Fan Zhang
51449262db Code inspector test clean up.
Make sure code inspector tests fail if the grandfather list contains
things that no longer exists in code

Change-Id: Ib114909959040275a9d9aebd81ecbe3d96d3af03
Test: make RunSettingsRoboTests -j40
Fix: 37686032
2017-05-15 14:56:18 -07:00
Fan Zhang
9834bd82da Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to
  Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
  user enable dev options before use.
- Add search in SpecialAccessSettings

Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix: 38290299
Fix: 37469224
Test: make RunSettingsRoboTests
2017-05-15 13:22:51 -07:00
TreeHugger Robot
f952789285 Merge "Add pairing preference" 2017-05-15 20:12:45 +00:00
jackqdyulei
1b853c5597 Add pairing preference
This preference lives in paired category. When clicked, it will
go to the pairing page.

Bug: 35877041
Test: RunSettingsRoboTests
Change-Id: I64706c49c8d303a494d4c1827e1f86b59effd54c
2017-05-15 10:46:28 -07:00
Fan Zhang
8e0754e84c Correctly report whether the current app is default home.
Change-Id: I79c374228e82c91667d7b5a0dcc19fa1216e57c4
Fix: 38065524
Test: make RunSettingsRoboTests
2017-05-15 10:17:37 -07:00
Maurice Lam
9f1a44599b Merge "Clean up choose lock intent creation" 2017-05-13 00:43:51 +00:00
Doris Ling
01639b7504 Merge commit '071aa6b88bc1fb4ca0af0c67b89b4bf0c3ac5de0' into manual_merge_071aa6b88b
Change-Id: I06f6e1bf1bbff0ac2e5ea7200432e8edb66ee1e3
Test: make RunSettingsRoboTests
2017-05-12 15:51:11 -07:00
Maurice Lam
2eb170cd6f Clean up choose lock intent creation
Consolidated the many variants of ChooseLock*.createIntent, so that
it will take the same set of arguments.

Also modified SetupChooseLock*.createIntent to modifyIntentForSetup,
which will take the intent created by ChooseLock* and modify it for
use with setup.

Test: cd tests/robotests && mma
Change-Id: I5ff033f459c33ec9980872a536b3996d89f2bbbb
2017-05-12 15:35:20 -07:00
TreeHugger Robot
d821a32b8e Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev 2017-05-12 21:54:22 +00:00
TreeHugger Robot
1949776c59 Merge "Hide app info link for "All work apps" data usage detail" 2017-05-12 21:31:09 +00:00
Juan Lang
a5f0a82f8f Merge changes from topic 'footer-settingslib'
* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +00:00
Matthew Fritze
031af9f287 Remove Wallpaper duplicate from setting search
Bug: 33701673
Test: make -j40 RunSettingsRoboTests
Change-Id: I520cbc74284d92ab05b733346ee1b3115ddd8e9f
2017-05-12 12:00:48 -07:00
TreeHugger Robot
2270c87100 Merge "Revert "Revert "Filter and display top 3 suggestions for exclusive type""" 2017-05-12 18:14:49 +00:00
Fan Zhang
59fd017ce5 Revert "Revert "Filter and display top 3 suggestions for exclusive type""
This reverts commit 184ae963e7.

Change-Id: Iac60fc52a5b0c153945c22b97394546a529d3bb4
2017-05-12 18:12:58 +00:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00