Phil Weaver
eb1a7f924f
Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp
...
am: 4ccb4fd19e
2017-05-12 23:47:03 +00:00
Phil Weaver
f7ef513e03
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 am: 8f58e8b6e9 -s ours
...
am: be70654977
2017-05-12 23:46:18 +00:00
Badhri Jagan Sridharan
296e5e3ee6
Merge "Use StartActivityForResult to launch the intent."
2017-05-12 23:21:47 +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
Android Build Merger (Role)
4ccb4fd19e
Merge "Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours am: 1c3120f196" into oc-dev-plus-aosp
2017-05-12 22:22:16 +00:00
Phil Weaver
be70654977
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97
...
am: 8f58e8b6e9
2017-05-12 22:21:56 +00:00
Phil Weaver
4f004a719c
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c am: 611fda4a97 -s ours
...
am: 1c3120f196
2017-05-12 22:21:56 +00:00
Phil Weaver
1c3120f196
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
...
am: 611fda4a97
2017-05-12 22:19:53 +00:00
Phil Weaver
8f58e8b6e9
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239 am: 7f1bc85e4c
...
am: 611fda4a97
2017-05-12 22:17:54 +00:00
Phil Weaver
611fda4a97
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a am: 8247008239
...
am: 7f1bc85e4c
2017-05-12 22:16:26 +00:00
Phil Weaver
7f1bc85e4c
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60 am: 9b8abd652a
...
am: 8247008239
2017-05-12 22:14:22 +00:00
Phil Weaver
8247008239
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4 am: adf8f8bc60
...
am: 9b8abd652a
2017-05-12 22:11:56 +00:00
Phil Weaver
9b8abd652a
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67 am: 11b6279ed4
...
am: adf8f8bc60
2017-05-12 22:08:53 +00:00
Phil Weaver
adf8f8bc60
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e am: beb7f31d67
...
am: 11b6279ed4
2017-05-12 22:07:24 +00:00
Doris Ling
071aa6b88b
Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
...
am: d821a32b8e
2017-05-12 22:06:32 +00:00
Phil Weaver
11b6279ed4
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f am: 5d6d70a50e
...
am: beb7f31d67
2017-05-12 22:05:52 +00:00
Phil Weaver
beb7f31d67
Don't enable a11y service if scary dialog obscured am: 9a1b4eb21f
...
am: 5d6d70a50e
2017-05-12 22:02:53 +00:00
Phil Weaver
5d6d70a50e
Don't enable a11y service if scary dialog obscured
...
am: 9a1b4eb21f
2017-05-12 22:00:23 +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
Fan Zhang
64ea8403bf
Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2cf0
...
am: 2fdb45913b
2017-05-12 20:59:40 +00:00
Fan Zhang
2fdb45913b
Merge "Add a no-op activity to handle development setting intent." into oc-dev
...
am: 0036ef2cf0
2017-05-12 20:42:53 +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
TreeHugger Robot
0036ef2cf0
Merge "Add a no-op activity to handle development setting intent." into oc-dev
2017-05-12 20:16:20 +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
Sudheer Shanka
b13d0c5d2f
Merge "Update FakeUid to include new methods." into oc-dev am: 129369e58e
...
am: 2c49941e5a
2017-05-12 18:18:33 +00: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
Sudheer Shanka
2c49941e5a
Merge "Update FakeUid to include new methods." into oc-dev
...
am: 129369e58e
2017-05-12 18:09:55 +00: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
2017-05-12 18:03:58 +00:00
Sudheer Shanka
129369e58e
Merge "Update FakeUid to include new methods." into oc-dev
2017-05-12 18:02:44 +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
Daniel Nishi
7bb541b6ff
Fix a bug where storage settings flickers.
...
The bug resulted from the fact that turning off loading while loading is
turned off causes the loading finishing animation to flicker. By only
turning it off when it is on, we ensure it works.
Change-Id: Ia31bf3e9aa90726e39b6bc7189d175c38fb51e5a
Fixes: 38045492
Test: Manual
2017-05-12 09:43:00 -07:00
Adrian Roos
9b6b6d8c5e
Merge "AOD: Add temporary always-on setting"
2017-05-12 16:40:10 +00:00
Juan Lang
e1fc16892e
Add a factory method to create a Lifecycle.
...
Some unit tests in other packages want to override the mLifecycle member
with their own value. When the Lifecycle class moves into SettingsLib,
the classpath of ObservableDialogFragment and Lifecycle have to remain
consistent. This change allows dependent classes to remain agnostic to
Lifecycle's classpath.
Test: make RunSettingsGoogleRoboTests && make RunSettingsLibRoboTests &&
make RunSettingsRoboTests
Change-Id: I594e447741aeeb3ba95afb4044d496b1540bd92c
2017-05-12 09:24:20 -07: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
Julia Reynolds
5b1bc2acad
Merge "Notification settings, importance and pre-O apps" into oc-dev am: 6393e1752f
...
am: 237eb88434
2017-05-12 12:28:35 +00:00
Julia Reynolds
237eb88434
Merge "Notification settings, importance and pre-O apps" into oc-dev
...
am: 6393e1752f
2017-05-12 12:20:36 +00:00
Julia Reynolds
6393e1752f
Merge "Notification settings, importance and pre-O apps" into oc-dev
2017-05-12 12:14:11 +00:00
Amin Shaikh
04f40e3b45
Merge changes from topic 'onarevert' into oc-dev am: b747be0769
...
am: 8485562ded
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
2017-05-12 09:00:24 +00:00
Matthew Fritze
031bb4e3a5
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am: b38c1e5353
...
am: 01f5f5d5c9
2017-05-12 08:59:41 +00:00
Chris Wren
fed86ddf91
Merge "add a global control for badging" into oc-dev am: 1425b91bac
...
am: aebf049b4f
2017-05-12 08:59:11 +00:00
jackqdyulei
4f93c27831
Merge "Add animation for battery asyncLoader." into oc-dev am: 6c680a36c5
...
am: 4b749c2b0a
2017-05-12 08:58:41 +00:00
