Commit Graph

2068 Commits

Author SHA1 Message Date
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
Fan Zhang
e19209a42c Merge "Revert "Filter and display top 3 suggestions for exclusive type"" 2017-05-12 18:06:51 +00:00
Fan Zhang
184ae963e7 Revert "Filter and display top 3 suggestions for exclusive type"
This reverts commit 70b634adcf.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
2017-05-12 18:03:58 +00:00
Shinji Sogo
8b23c35954 Show security info in saved network list
When an access point linked to a saved network is not found,
security info should be shown in dialog of saved network.
Notes that in Android N this list is created with saved networks
and scan result, and that causes security info is not shown for
access points seen around user, but in Android O only saved
networks are used to create a list. That means security info is
shown for all access points listed in the screen.

Bug: 38102896
Test: make RunSettingsRoboTests

Change-Id: Ia0c5184ae7a1325f2628f4c08e29350c5793a08f
(cherry-pick of a8382c11f58ecbfbc5b8d908b97c53d59cf774fe)
2017-05-12 10:35:08 -07:00
Doris Ling
2f02218493 Change AppPrefLoader from AsyncTask to AsyncLoader.
Showing the wifi data usage results in reaching the max number of
threads in the pool executor. Switching the loader implementation
from Async task to AsynLoader and use a single loader to get the
whole list of preferences instead of using a new task to create each
list element.

Change-Id: I0da19ca09031a7fa178970c192e12a99ab489145
Fix: 33820327
Test: make RunSettingsRoboTests
2017-05-12 10:34:20 -07:00
TreeHugger Robot
96e6f69597 Merge "Filter and display top 3 suggestions for exclusive type" 2017-05-12 17:28:35 +00:00
Fan Zhang
470caeaa80 Hide app info link for "All work apps" data usage detail
We should hide the link because "All work apps" is a meta app, it
doesn't point to any specific app, so app info link does not make sense.

Change-Id: I768786f2df5d05bbde0723e5585abcdbe875c652
Fix: 36542896
Test: make RunSettingsRoboTests
2017-05-12 10:21:33 -07:00
Adrian Roos
9b6b6d8c5e Merge "AOD: Add temporary always-on setting" 2017-05-12 16:40:10 +00:00
Fan Zhang
70b634adcf Filter and display top 3 suggestions for exclusive type
Change-Id: Ief4c2f02fcf1064dac3659502bd7511b09a2a7df
Fix: 37947647
Test: make RunSettingsRoboTests
2017-05-12 08:47:39 -07:00
Amin Shaikh
04f40e3b45 Merge changes from topic 'onarevert' into oc-dev am: b747be0769
am: 8485562ded

Change-Id: Ifb18d7f498cca6e51922460b516650982dbedabd
2017-05-12 09:00:33 +00:00
Amin Shaikh
1383a9e882 Revert "Update "Open networks available" toggle to instead open notification channel preferences." am: dfa9bb8914
am: c3666f1c35

Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
2017-05-12 09:00:24 +00:00
Chris Wren
fed86ddf91 Merge "add a global control for badging" into oc-dev am: 1425b91bac
am: aebf049b4f

Change-Id: I68417e74c7a46cf6283529f17a5f3f9d5547354a
2017-05-12 08:59:11 +00:00
Doris Ling
d523a72f76 Merge "Fix crash when activity not attached after search index finishes." into oc-dev am: d3e33ebcef
am: 93ff2d69f1

Change-Id: I5d55d343a800b343e3cf859ff4cd4381927d56a2
2017-05-12 08:58:02 +00:00
Amin Shaikh
c3666f1c35 Revert "Update "Open networks available" toggle to instead open notification channel preferences."
am: dfa9bb8914

Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
2017-05-12 06:48:04 +00:00
TreeHugger Robot
b747be0769 Merge changes from topic 'onarevert' into oc-dev
* changes:
  Update "Open networks available" setting.
  Revert "Update "Open networks available" toggle to instead open notification channel preferences."
2017-05-12 04:40:27 +00:00
Chris Wren
1425b91bac Merge "add a global control for badging" into oc-dev 2017-05-12 01:49:07 +00:00
Matthew Fritze
76d9b53048 Remove Special App Access duplicate from Setting search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I7f6a466c0551828c319c2da541fbeb0e428c62f8
2017-05-11 18:37:47 -07:00
TreeHugger Robot
6c680a36c5 Merge "Add animation for battery asyncLoader." into oc-dev 2017-05-12 01:35:23 +00:00
TreeHugger Robot
d3e33ebcef Merge "Fix crash when activity not attached after search index finishes." into oc-dev 2017-05-12 01:31:21 +00:00
Matthew Fritze
4d9a1ae9a2 Remove default app duplicates in search
Default Work Browser and Phone app search results look
identical to the regular defaults. Supress the results
until we differentiate work results.

"Assist and voice input" duplicate is a parent-child
duplication and is removed, as well.

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I3bb75c199cd76e24de42548dd166c4bccd0c7f0a
2017-05-11 18:01:49 -07:00
Adrian Roos
95ff1f4131 AOD: Add temporary always-on setting
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.

Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.

Also adds tests for both doze preference controllers.

Bug: 33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
2017-05-11 17:15:20 -07:00
TreeHugger Robot
631120f1ad Merge "Add bluetooth visible item" 2017-05-11 23:45:29 +00:00
TreeHugger Robot
b823fcc431 Merge "Add animation for battery asyncLoader." 2017-05-11 23:07:00 +00:00
TreeHugger Robot
eb9c9fb569 Merge "Refactor choose lock password scrolling" 2017-05-11 22:41:15 +00:00
jackqdyulei
a3c528f64d Add animation for battery asyncLoader.
When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.

Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
Merged-In: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 15:27:23 -07:00
Chris Wren
485e75e063 add a global control for badging
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Maurice Lam
c41e408aea Refactor choose lock password scrolling
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.

Bug: 38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
2017-05-11 19:26:12 +00:00
Matthew Fritze
03dfa50996 Replace dynamic summary text for SettingPref
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
2017-05-11 12:11:05 -07:00
Maurice Lam
3ffdc4d15b Merge "Check for sidecar null-ness before removing" into oc-dev am: 59f965d698
am: 7e60ce0109

Change-Id: I7551cd4c9d045f274ceac271da71667aeb275966
2017-05-11 18:52:45 +00:00
jackqdyulei
ae86781edd Add bluetooth visible item
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.

This cl creates a preference controller to handle the logic for
device name preference.

Bug: 35876447
Test: RunSettingsRoboTests

Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
2017-05-11 11:12:25 -07:00
Maurice Lam
59f965d698 Merge "Check for sidecar null-ness before removing" into oc-dev 2017-05-11 17:35:17 +00:00
jackqdyulei
14dcca0e91 Add animation for battery asyncLoader.
Fix merge conflict from oc-dev

When battery asyncLoader is loading batterystats, show a battery
placeholder(critical level) and animate to real status once data is
loaded.

Bug: 35917699
Test: RunSettingsRoboTests
Change-Id: Ie4ff73ff2cc0b9e17b4541e3284bf2ac34da42c4
2017-05-11 10:05:33 -07:00
Stephen Chen
9eecfb3de7 Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am: 25d1848e5f
am: ac1b935437

Change-Id: Ieec705671f062119f67a94b559edc40762d90950
2017-05-11 06:18:36 +00:00
Doris Ling
1886fe1bae Merge "Also update the account preferences in displayPreference()." into oc-dev am: cf162d5354
am: 2a23542e68

Change-Id: Ifa0d367e40647ce825e90985658dc6a042edc2bd
2017-05-11 01:04:40 +00:00
Jesse Evans
eabee5af2f Merge "Properly set isInstantApp for power usage page" into oc-dev am: 3c19120945
am: 28839c0531

Change-Id: I9a07ac3ab22585c93f0f8d90f324dab99e24ca7f
2017-05-11 01:03:32 +00:00
Matthew Fritze
a20e068d2c Merge "Only add icons to settings items with icons" into oc-dev am: ec00573139
am: ab13b378c9

Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616
2017-05-11 00:54:01 +00:00
Daniel Nishi
2c00b770eb Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a
am: a3349519d5

Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
2017-05-11 00:52:07 +00:00
Maurice Lam
e1976ac302 Check for sidecar null-ness before removing
Test: cd tests/robotests && mma
Bug: 36681116
Change-Id: Id48113502c538b607d92700d3e58943614cfc150
2017-05-10 17:17:44 -07:00
TreeHugger Robot
25d1848e5f Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev 2017-05-11 00:05:53 +00:00
TreeHugger Robot
cf162d5354 Merge "Also update the account preferences in displayPreference()." into oc-dev 2017-05-10 23:39:53 +00:00
TreeHugger Robot
3c19120945 Merge "Properly set isInstantApp for power usage page" into oc-dev 2017-05-10 20:47:29 +00:00
Lei Yu
7932d5a66f Merge "Expose mac address in bluetooth main page" 2017-05-10 20:42:03 +00:00