Matthew Fritze
8cd0562bd6
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev am: 4bd0f411ce
...
am: af054e63e0
2017-05-17 19:06:59 +00:00
Matthew Fritze
af054e63e0
Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
...
am: 4bd0f411ce
2017-05-17 18:50:28 +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
2017-05-17 17:53:08 +00:00
Matthew Fritze
d53409356d
Merge "Remove Network Restrictions duplicate from setting search" into oc-dev
...
am: 09dbc8043f
2017-05-17 17:37:51 +00:00
Matthew Fritze
f81f1024c3
Merge "Remove Legal Information duplicate from Settings search" into oc-dev am: 915f0cea5b
...
am: 70db53a8d5
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
70db53a8d5
Merge "Remove Legal Information duplicate from Settings search" into oc-dev
...
am: 915f0cea5b
2017-05-17 17:26:07 +00:00
Matthew Fritze
dffaa57cb1
Merge "Remove default app duplicates in search" into oc-dev am: 0c55014b88
...
am: 79cfaa7b91
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
2017-05-17 17:16:47 +00:00
Matthew Fritze
79cfaa7b91
Merge "Remove default app duplicates in search" into oc-dev
...
am: 0c55014b88
2017-05-17 17:14:24 +00:00
Matthew Fritze
5a151d23ab
Merge "Remove Wallpaper duplicate from setting search" into oc-dev
...
am: 564b965ccc
2017-05-17 17:13:46 +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
2017-05-17 04:48:50 +00:00
Matthew Fritze
f8b8ecebea
Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
...
am: bcb2565e05
2017-05-17 04:46:15 +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
2017-05-17 02:56:28 +00:00
Matthew Fritze
61c80c2ab6
Merge "Remove Special App Access duplicate from Setting search" into oc-dev am: d6aa9f3454
...
am: c6192251b2
2017-05-16 22:53:37 +00:00
Matthew Fritze
c6192251b2
Merge "Remove Special App Access duplicate from Setting search" into oc-dev
...
am: d6aa9f3454
2017-05-16 22:44:49 +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
Shinji Sogo
b8548f762c
Merge "Show security info in saved network list" into oc-dev am: ecd1df1076
...
am: 183aed6dd6
2017-05-16 15:39:57 +00:00
Shinji Sogo
183aed6dd6
Merge "Show security info in saved network list" into oc-dev
...
am: ecd1df1076
2017-05-16 15:33:36 +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
2017-05-16 01:56:55 +00:00
Matthew Fritze
1f21e7f325
Merge "Replace dynamic summary text for SettingPref" into oc-dev
...
am: 49b86b5c6a
2017-05-16 00:12:07 +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
Doris Ling
071aa6b88b
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
...
am: d821a32b8e
2017-05-12 22:06:32 +00: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
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
Fan Zhang
e19209a42c
Merge "Revert "Filter and display top 3 suggestions for exclusive type""
2017-05-12 18:06:51 +00:00
