Commit Graph

78 Commits

Author SHA1 Message Date
Sean Stout
2ae92b541d Improve Night Light suggestion criterion
Night Light suggestion will now show even if the user is using Night
Light in manual mode. If the user has previously tapped or dismissed the
suggestion, the suggestion will not show again.

Bug: 68938869
Test: make ROBOTEST_FILTER=\
"(NightDisplayPreferenceControllerTest|SuggestionFeatureProviderImplTest)" \
RunSettingsRoboTests

Change-Id: Iea838df043d75dfa73a1a383275dc42956374113
2018-03-30 23:12:16 +00:00
Dieter Hsu
beb89c3545 Support AOD in the Universal Settings API
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I609ac74f70bf040bd9033f421b4bb7c02bf33440
2018-03-30 13:20:56 +08:00
LexHuang
78df73f00a Support Screen Rotate in the Universal Settings API
Change extend from AbstractPreferenceController to TogglePreferenceControllear

Bug: 67997439
Test: make RunSettingsRoboTests
Change-Id: I86e59d00384fb131f2f2b92186e8536324db2e1b
2018-03-30 02:32:36 +00:00
TreeHugger Robot
0ae4204f54 Merge changes I0fde4f80,Iea1cff48 into pi-dev
* changes:
  Update TimezoneInfoPrefController to register in xml
  Make FontSizePreferenceController slice compatible.
2018-03-29 23:49:22 +00:00
Fan Zhang
f75edca09f Revert "Support AOD in the Universal Settings API"
This reverts commit 537c2cfc2c.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
2018-03-29 20:20:31 +00:00
Fan Zhang
fc1590e901 Make FontSizePreferenceController slice compatible.
Bug: 67997826
Test: robotests
Change-Id: Iea1cff48f39e1433abea285309376876e8356c07
2018-03-29 12:33:13 -07:00
Dieter Hsu
537c2cfc2c Support AOD in the Universal Settings API
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I161bc5746573444b284a03de8f5d4d8e510153dc
2018-03-28 02:12:16 +00:00
Sean Callanan
504cc266d8 [Settings] Add strings for Natural and Automatic color modes
These strings are not properly reflected in the UI yet.  Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).

Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
(cherry picked from commit e8f9bf5f68)
2018-03-23 20:06:25 +00:00
James Lemieux
22a39c2b93 Use external/robolectric-shadows/run_robotests.mk
This allows Settings to test against the latest framework changes.

Also replaced TestConfig with traditional robolectric.properties.

Bug: 73173204
Bug: 73892008
Test: make -j56 RunSettingsRoboTests
Change-Id: I3135b4fa5f095ba79b282a76f45dd9baa2584bc7
2018-03-04 03:50:08 -08:00
Sean Callanan
1619695402 Merge "Add a preview image to the color mode preference." 2018-03-01 22:39:23 +00:00
Sean Callanan
2dd4377423 Add a preview image to the color mode preference.
For high-color displays, it's desirable to have a preview of the
impact the user's color preference will have on images.  This commit
adds that functionality to ColorModePreferenceFragment by extending
RadioButtonPickerFragment to support static content.

The image used here is a placeholder pending UX.

Bug: 73670362
Test: Added a test verifying that the preview is added correctly.
Change-Id: Id54316bbef6a22291a8e8acbda5fcb2839b88c23
2018-03-01 13:10:26 -08:00
Doris Ling
be2a265bda Add summary for Display->Color settings.
Change-Id: Ia1332b4e3333099878ee52342c64b3d8595fdd94
Fixes: 73773857
Test: make RunSettingsRoboTests
2018-02-28 11:29:36 -08:00
Dake Gu
fef14cac00 Settings: Move DefaultAppInfo CandidateInfo to SettingsLib
Bug: 3600711
Test: Moved DefaultAppInfoTest to SettingsLib
      m RunSettingsRoboTests
Change-Id: If9e2288009277f1940b9769790b78bb0a58b626a
2018-02-23 13:23:16 -08:00
Adrian Roos
807cf8d2c5 Use new OverlayManager categories
Using this, we split overlays based on their category, so that
cutout emulation and theme overlays no longer clash in their
respective settings.

Bug: 72436677
Test: make ROBOTEST_FILTER=EmulateDisplayCutoutPreferenceControllerTest RunSettingsRoboTests
Change-Id: I23f22113351b3948beb9e3a1fb969700852539cc
2018-02-13 19:13:10 -08:00
Michael Wright
30b66159aa Change automatic brightness summary to absolute brightness.
The brightness slider now always represents the absolute brightness,
including when adaptive brightness is enabled. This changes the summary
of the brightness setting to reflect that.

Bug: 72627086
Test: ROBOTEST_FILTER=BrightnessLevelPreferenceControllerTest m -j RunSettingsRoboTests
Change-Id: I76eed8aa9ee88fe6b70e30d54bfc0d18d1141377
2018-01-29 16:52:47 +00:00
Leif Hendrik Wilden
28dee1f086 Migrate to use instrumentation classes from settingslib.
Test: Compiles. Manually tested.
Change-Id: I70a6e76cc8440547746ecc008c32bd06a7de8161
2018-01-24 12:30:39 -08:00
TreeHugger Robot
e3f187a4a9 Merge "Revert "Migrate to use instrumentation classes from settingslib."" 2018-01-23 01:58:18 +00:00
Leif Wilden
cab0ee611d Revert "Migrate to use instrumentation classes from settingslib."
This reverts commit 1546cca529.

Reason for revert: Broke fingerprint setup flow. b/72267201

Change-Id: I8321265ae64732c526325882ddea51080decddf5
2018-01-22 20:57:36 +00:00
TreeHugger Robot
a9f6d41635 Merge "Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set." 2018-01-19 22:25:23 +00:00
yuemingw
cdeeaff473 Block sleep options in Settings app when DISALLOW_CONFIG_SCREEN_TIMEOUT is set.
Test: m -j RunSettingsRoboTests
Bug: 67675734
Change-Id: Icdcadd03caa2884338d4300fb41f0036b8b9eb51
2018-01-19 20:01:21 +00:00
Leif Hendrik Wilden
1546cca529 Migrate to use instrumentation classes from settingslib.
Test: Compiles. Manually tested.
Change-Id: Ie5515bb0fe3e621fc7723a9b04ba23e4bfa9c401
2018-01-18 11:13:24 -08:00
Fan Zhang
4e08869e1a Make a strong reference to LifecycleOwner in tests
Change-Id: Id3b26ded6c903b67b9880dbfe1a0656a564c8947
Fixes: 71867776
Test: rerun tests
2018-01-11 14:30:16 -08:00
Pavel Grafov
8e02f0e7e7 Managed profile lock timeout
Test: make ROBOTEST_FILTER=TimeoutPreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=LockAfterTimeoutPreferenceControllerTest RunSettingsRoboTests
Bug: 63908311
Change-Id: I7236ec4ca37353703145c3e75d508101ecc6ca80
2017-12-20 17:34:28 +00:00
Pavel Grafov
d50a536d1d Unit test for screen timeout policy handling in Settings
This is a follow-up for http://ag/3123412

Test: make ROBOTEST_FILTER=LockAfterTimeoutPreferenceControllerTest RunSettingsRoboTests
Test: make ROBOTEST_FILTER=TimeoutPreferenceControllerTest RunSettingsRoboTests

Bug: 63908311
Change-Id: I27631743d52163f3b6d1589b427ba617e74725a9
2017-12-19 21:05:16 +00:00
jeffreyhuang
cbfb099a40 Rename SDK_VERSION_O to SDK_VERSION
Test: make RunSettingsRoboTests -j40
Change-Id: I6715062d8addadda441e32809db1af55f15e3a90
2017-12-05 16:43:54 -08:00
Fan Zhang
dff6dd687e Move away from deprecated FakeFeatureFactory.setupForTest()
Test: rerun
Change-Id: I896ba414315ddb1664c0499264f4992f0554ef98
2017-12-05 10:12:10 -08:00
Matthew Fritze
c448863577 Index Nightdisplay Settings into search
Adds a SearchIndexProvider into NightDisplaySettings
to index night_display_settings.xml. It will show
up in search as long as ColorDisplayController
is available.

Also, supress the search result for Night Display
under Display settings in favor of the actual toggle.

Test: robotests
Fixes: 69852201

Change-Id: Id014a5ab03e7a6b5fc99f79a1cb41a0c06323f9c
2017-11-30 08:56:20 -08:00
TreeHugger Robot
c2d84d8d2f Merge changes I88978ab8,I07137c92,Ifdd4db51
* changes:
  Move display test package to sdk 26
  Update AppGridViewTest to sdk 26
  Update AmbientDisplayAlwaysOnPrefTest to sdk 26
2017-11-29 00:09:31 +00:00
jeffreyhuang
adc9d7fb4e Move display test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I88978ab800e845eda6c937bf890016d53928d4fd
2017-11-28 13:41:30 -08:00
jeffreyhuang
4a19283b00 Update AppGridViewTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I07137c9274920a163db4ddf676800d70ef76c8bb
2017-11-28 13:41:19 -08:00
jeffreyhuang
f279ba3f72 Update AmbientDisplayAlwaysOnPrefTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ifdd4db51e87fd38defef23946811b5e24e6c7cfe
2017-11-28 13:41:02 -08:00
Matthew Fritze
3a4168360b Add SettingsPrefController for Slices
Adds a new abstraction layer between preference controllers
and the AbstractPreferenceController. The layer is used to
consolidate the logic for each the setting type for getting
and setting values. This will be extended to support UI
information for Slices.

For reference how this fits into Slices, look at the
like-named classes added in this prototype:
ag/3221891

The changes in Search are as a transition into deprecation.
The code for Search in Settings is out-of-date from the
unbundled counterpart, and this change is made so that the
current code behaves as normal.

Test: robotests
Bug: 67996707
Change-Id: Ib1faab706485039edad66119a27a3fd5cabe6009
2017-11-27 16:35:42 -08:00
Tony Mantler
94a7c7d21c Convert SettingsLib Lifecycle to Flatfoot
Bug: 69257739
Test: m -j RunSettingsRoboTests
Change-Id: I27e7850c39afb9c09297007e8cc352f410665653
2017-11-14 11:04:40 -08:00
Christine Franks
4f03562716 NightDisplayController -> ColorDisplayController
Now that it controls both night display and color mode,
the NightDisplayController should reflect its expanded
purpose.

Bug: 68258004
Test: make RunSettingsRoboTests -j100
Change-Id: If0ad2539b44daf821fdba83b81de1199ad1ecc21
2017-11-03 12:03:20 -07:00
Doris Ling
5a66ddbd6f Add screen resource for Colors setting.
- each preference fragment should have its own preference screen layout
in order to show the title correctly. Adding the missing data for
ColorModePreferenceFragment.

Change-Id: I172429dc957f94351456d4bc829897a578d7dbf9
Fixes: 68763217
Test: make RunSettingsRoboTests
2017-11-01 17:49:35 -07:00
Yoshinori Hirano
53cfd11793 Display network name in status bar
When config_showOperatorNameInStatusBar is true, "Network name" setting
is displayed in Settings app (Settings > Display).
The user can turn on/off the feature to display the network name in the
status bar from Settings app.

Fixes: 67620513
Test: manual - go to Settings > Display and turn on/off Network name.

Change-Id: I43f1d9cbea363527250639ce6146f1c5c6c8a482
2017-10-31 09:08:06 -07:00
Christine Franks
dd811e246b Move color mode to DisplayTransformManager
Bug: 68159303
Test: make -j100 && make RunSettingsRoboTests -j100
Change-Id: I1eb599bfec8e1841af43c43ca1c505233cb87c3d
2017-10-26 14:10:23 -07:00
Fan Zhang
f2ba1167c5 Merge "Only allow Settings app launch search result page" 2017-10-25 16:47:44 +00:00
Chia-I Wu
c60a52b9aa Merge "Add new color mode setting" into oc-mr1-dev am: 94aa05059d
am: c892a3cfc9

Change-Id: I971cf848dd70597c97270a008912c099c6bd24db
2017-10-25 04:55:14 +00:00
Fan Zhang
25f29bf126 Only allow Settings app launch search result page
Bug: 68199963
Test: robotest
Change-Id: I0018e9c60b0dd46fc2420a563a93b706bf252dc4
2017-10-24 16:27:47 -07:00
Romain Guy
05fa18f847 Add new color mode setting
Replace the "vivid" mode setting with a new 3 choice screen:
- Natural (sRGB)
- Boosted (sRGB + 10% saturation)
- Saturated (unmanaged, colors are assigned the native color space)

The "Colors" setting that replaces "Vivid" only appears on devices
that support wide gamut rendering and color management. Changing
the color mode has an immediate effect and triggers a configuration
change in running application so that applications that request
wide color gamut rendering can react properly (since they lose
that ability).

Bug: 68159303
Test: make RunSettingsRoboTests
Change-Id: I7009723e11ee164c93719f0e42fed9d1b3cf6e01
2017-10-24 22:19:09 +01:00
Fan Zhang
abdeead114 Convert more loadIcon() to IconDrawableFactory
- AppGridView: used by preview chart in display size setting.
- DefaultBrowserPreferenceController: default browser icon in default
  apps settings
- Enterprise application list
- Accessibility search result loader

Change-Id: Ibd12cd8854c68760ea3428fffa735bcbba48a277
Fixes: 64336923
Test: robotests
2017-10-18 15:03:19 -07:00
Doris Ling
9a3fd4f7f1 Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev am: d52c4482e4
am: eccb0fcff9

Change-Id: Ic62d580bad8d520e9a1ec942ab30c361df9e24aa
2017-09-28 02:07:04 +00:00
Maurice Lam
e18902ec67 Update Robolectric to 3.4.2
Bug: 66693279
Test: m RunSettingsRoboTests
      m RunSettingsRoboTests-jacoco
Change-Id: I9df619c3d68f0af2ee2ae944a15998275129f7c2
2017-09-22 18:34:00 +00:00
Doris Ling
308a2d93fb Move listening to brightness changes to onStart/onStop.
Currently, we register the brightness listener in onResume() and stop
listening in onPause(). When we launch the brightness selection bar, the
display settings is paused, and hence we don't get the brightness
update, and only refresh the percentage when the brightness bar is
dismissed.

Moving the listening logic to onStart()/onStop() instead, so that we
will get the updates all the time when the display settings is launched.

Change-Id: I6ed9c8485fdf7721374baff5cea5f7011b63d7ea
Fixes: 65981061
Test: make RunSettingsRoboTests
2017-09-20 15:36:14 -07:00
Doris Ling
dee1a22c45 Consolidate all wrappers used for testing.
- Add the wrapper package and move all wrappers to the wrapper package.
- Get rid of some wrapper interface/impl implementation and have a
wrapper class directly.

Bug: 65634579
Test: make RunSettingsRoboTests
Change-Id: Ic757d8f7bacfa7a034c7e692205bc1dc4b0e1de1
2017-09-14 18:24:49 -07:00
Daniel Nishi
739b0eef10 Move the Robolectric shadow config up.
In my testing, this reduces the runtime of the Robolectric Settings test
suite on my Z840 workstation from 440 seconds to 402 seconds on average.
By avoiding having a method-level Robolectric shadow import, we avoid
going down a code path which needs to add more shadows later in the
Robolectric execution.

Bug: 64808827
Test: Settings robotests still pass
Change-Id: I7b40d73b30306ae3f9759281afbd7f7266579e24
2017-08-17 14:37:27 -07:00
Geoffrey Pitsch
f3fc635947 AOD setting availability depends on other user settings
Bug: 62918778
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Change-Id: Id6f1ad580cf5caace82a1bfa85e85b98f134f9d6
2017-07-31 13:56:41 -04:00
Andrew Sapperstein
50ca1968e6 Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:20:19 +00:00
TreeHugger Robot
4906a2a38a Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev 2017-07-26 06:11:07 +00:00