Commit Graph

17310 Commits

Author SHA1 Message Date
Daniel Nishi
90c963b1fa Merge "Fix a bug where storage settings flickers." into oc-dev
am: 1da7123930

Change-Id: I1cfe2b00a37e26d0e4f7c6806fadb601c5fdb617
2017-05-16 17:07:34 +00:00
Daniel Nishi
1da7123930 Merge "Fix a bug where storage settings flickers." into oc-dev 2017-05-16 17:01:30 +00: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
Shinji Sogo
183aed6dd6 Merge "Show security info in saved network list" into oc-dev
am: ecd1df1076

Change-Id: I068abbefd82c0447e474d6db6c38a56ea4703217
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
Maurice Lam
edb3944984 Default setup wizard to use PIN
- Added "Screen lock options" button in PIN screen, controlled by
  extra EXTRA_SHOW_OPTIONS_BUTTON, which will create a dialog to ask
  the user to choose another screen lock type.
- Extracted ScreenLockType enum and ChooseLockGenericController that
  can be shared by ChooseLockGeneric and the dialog
  ChooseLockTypeDialogFragment.
- The intent extra EXTRA_SHOW_OPTIONS_BUTTON will be set if
  ChooseLockGeneric screen starts ChooseLockPassword /
  ChooseLockPattern without asking the user. (Although the extra is
  ignored by ChooseLockPattern currently)
- Fix layout alignment for the password entry field to remove the
  extra 4dp padding on the sides.

Test: cd tests/robotests && mma
Bug: 35442933
Bug: 38002299
Change-Id: I877fbe08a0c05bb97175e1cbf0260ea6dbda22e2
2017-05-15 21:12:23 -07: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
Matthew Fritze
1f21e7f325 Merge "Replace dynamic summary text for SettingPref" into oc-dev
am: 49b86b5c6a

Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
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
96d05ef43a Merge "Update strings in special app access and dev options" 2017-05-15 22:23:02 +00:00
Pankaj Kanwar
9e8a182c31 Merge "Remove Sleep options from Advanced wifi." 2017-05-15 20:23:18 +00: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
pkanwar
2fca2ebddf Remove Sleep options from Advanced wifi.
Sleep options are not relevant any more. This CL removes them from the
settings code.

Bug: 35994481
Test: make RunSettingsRoboTests
Change-Id: Ibd0b33ded3aa2da3df73c519611c915deed6310f
2017-05-15 16:39:48 +00:00
Maurice Lam
9f1a44599b Merge "Clean up choose lock intent creation" 2017-05-13 00:43:51 +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
Doris Ling
071aa6b88b Merge "Change AppPrefLoader from AsyncTask to AsyncLoader." into oc-dev
am: d821a32b8e

Change-Id: If0208dec8535fe72b14f73f42eb56ecfd7c9d2f7
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
Fan Zhang
64ea8403bf Merge "Add a no-op activity to handle development setting intent." into oc-dev am: 0036ef2cf0
am: 2fdb45913b

Change-Id: Ib699ffe15a91fdaa1cbfbb788f4b0ee92752174a
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

Change-Id: I116509d6ee62fd0633729f832cf88e4e9d9c6708
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

Change-Id: Ie6ee2d4f97d604c11c76617c427b2e4175173b92
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.

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
Sudheer Shanka
2c49941e5a Merge "Update FakeUid to include new methods." into oc-dev
am: 129369e58e

Change-Id: I0f6ac2bd7ba43d31843c61b0478cfd39fb20da0d
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.

Change-Id: I6de213d4c276696c6ccc9e992ff088cf507aa7ce
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

Change-Id: Ie8c6262c35b79259974ffe069b37b2e6d2507b50
2017-05-12 12:28:35 +00:00
Julia Reynolds
237eb88434 Merge "Notification settings, importance and pre-O apps" into oc-dev
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
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

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
Matthew Fritze
031bb4e3a5 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am: b38c1e5353
am: 01f5f5d5c9

Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
2017-05-12 08:59:41 +00:00