Commit Graph

168 Commits

Author SHA1 Message Date
Jay Aliomer
f4bc80c45c Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 	145098277
Fixes: 145297188
Fixes: 	145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
2019-12-02 18:19:52 +00:00
Jay Aliomer
53ad4fedc6 Revert "Revert "Add settings for scheduling dark theme""
This reverts commit 50c0fa136c.

Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug: 141567787
2019-11-22 20:58:23 +00:00
Preston O'Neal
50c0fa136c Revert "Add settings for scheduling dark theme"
This reverts commit 7141b142df.

Reason for revert: This is breaking builds on git_qt-qpr1-dev

Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
2019-11-21 22:09:53 +00:00
Jay Aliomer
7141b142df Add settings for scheduling dark theme
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"

Fixes: 141567787

Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit 0828e6be9c)
2019-11-21 20:07:24 +00:00
Yi Jiang
336b0c23c5 Move the permission warning message to corresponding layout file.
Bug: 129284701
Test: Manually verified
Test: atest AdaptiveSleepPermissionPreferenceController

Change-Id: Ic31bdb37f751288ae6dcd1253d56806c767e2e47
2019-06-14 12:11:49 -07:00
Yi Jiang
c26745207d Show a 'permission missing' message in Screen Attention settings.
Bug: 129284701
Test: Manually verified.
Test: atest AdaptiveSleepSettingsTest

Change-Id: I6375929d59479a0aeb7e4aec184bd36e7f3ab33b
2019-06-10 17:18:10 -07:00
Yi Jiang
6da0447068 Fix unexpected grey-out in Screen attention
Fix preference controller searchable issue.

Bug: 132821023
Bug: 133255690
Test: atest AdaptiveSleepPreferenceControllerTest
Change-Id: I686ed827fbe572c9d8bcde2d8a8e00f2dcb5a6a8
2019-05-24 16:50:18 -07:00
Salvador Martinez
ee5f79edbd Fix dark theme and battery saver interaction
In settings we weren't properly taking into account battery saver
enabled dark theme. This CL makes it so that when battery saver
on we disable the toggle until battery saver is off since
you can't change dark theme in battery saver. Additionally it
adds a message indicating why the toggle was disabled so the
user doesn't get confused.

Test: robotests
Bug: 131913864
Change-Id: I855e429a666098c837650852d1e1355477afa13d
2019-05-14 14:08:24 -07:00
Raff Tsai
1b28754b98 Fix robolectric test error
Bug: 132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
2019-05-09 11:36:35 +08:00
Alex Salo
83a63abd2d Re-enable the test
Update the test to handle new API and simplify the logic in the
controller.

Bug: 130897305
Test: make RunSettingsRoboTests -j64

Change-Id: I0c46ff22d4a3bf913add753f85a24af9aeee0a33
2019-05-08 17:48:12 +00:00
Daniel Solomon
608ad6f632 Hide display white balance setting depending on accessibility
To avoid conflicting with display accessibility features, hide the
display white balance setting when these features are active.

Bug: 130263943
Test: make ROBOTEST_FILTER=DisplayWhiteBalancePreferenceControllerTest
RunSettingsRoboTests -j32

Change-Id: I9936a657521287a7a0482f2a934430bd79013cf3
2019-04-30 22:00:17 -07:00
TreeHugger Robot
1eb92917c9 Merge "Fix broken dark ui test" into qt-dev 2019-04-25 19:25:30 +00:00
Salvador Martinez
b0737ee174 Fix broken dark ui test
It was checking something in shared preferences which seems
to have stopped working (a bunch of the stuff used in the
test is deprecated). This CL just has it verify that
updateDarkTheme() is called when appropriate since that
is all we really care about.

Test: is a test
Bug: 130897882
Change-Id: If3286dd91b5a95cb0f41cac619a11a9089e0aecf
2019-04-25 10:25:15 -07:00
tmfang
e4753a3632 Tweak search result for adaptive brightness
- Create a new controller for auto brightness in
auto_brightness_detail.xml.
- We only show slice version for search result.
- Change slice summary for adaptive brightness.

Test: visual
Fixes: 130651278
Change-Id: If9b71735bbb2a0ee22676d9dfedab2cf9e778493
2019-04-24 10:04:38 +08:00
Fan Zhang
5d705839f2 Fix typo
Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
2019-04-19 13:31:52 -07:00
Fan Zhang
ef2e91913b Add @Ignore for all failing tests.
Bug: 130896210
Bug: 130896218
Bug: 130896701
Bug: 130897882
Bug: 130897305
Bug: 130897640
Bug: 130896049
Test: robo
Change-Id: I77143d504501b358c2103aa736cd2aad13ed4c5c
2019-04-19 13:23:29 -07:00
TreeHugger Robot
93aee0d99d Merge "Fix regression of wrong min value on night display slice" into qt-dev 2019-04-18 19:44:43 +00:00
lindatseng
55f66a9177 Fix regression of wrong min value on night display slice
The min value of NightDisplayIntensityPreferenceController
should always be 0 (which is the old value we used before
ag/7062353). The range is cacluated from the relative value
to MinimumColorTemperature, which means the min value should
always be 0.

Test: atest NightDisplayIntensityPreferenceControllerTest
Fixes:130758028
Change-Id: Ica75672dda6a9ee0c6013f1c903611263b7d133f
2019-04-18 11:11:12 -07:00
Amin Shaikh
87ef55ea90 Add Settings keywords for Styles & Wallpaper.
Reusing existing strings since this is coming in after string freeze.
TODO: create a new keyword string for this preference.

Fixes: 130759285
Test: m RunSettingsRoboTests and searching keywords on device
Change-Id: Ice1bc34b381302745cb55056377cc94ea74e8d50
2019-04-18 13:29:15 -04:00
TreeHugger Robot
e991b05b29 Merge "Check for attention permissions" into qt-dev 2019-04-16 22:02:43 +00:00
Alex Salo
c821ae1ee6 Check for attention permissions
If attention package does not have sufficient permissions - disable the
setting.

Bug: 130246574, 130350903
Test: make RunSettingsRoboTests and manually confirmed
Change-Id: Ia7a86c940522e72f7e895d6aec7500f1ef6f9889
2019-04-16 17:43:15 +00:00
Salvador Martinez
ef7ce46657 Change dark theme screen to toggle
The dark theme screen has been removed in favor of a simple
toggle with a dialog that shows up the first time a user
tries to enable dark theme when in light theme.

Test: robotests pass
Bug: 130251804
Change-Id: I48f8e24a2b2a117e5a8054c5bc0b240ba68fe1ad
2019-04-15 19:52:49 -07:00
Amin Shaikh
2a9911e3a0 Show Styles & Wallpaper in Settings
Show "Styles & Wallpaper" in Settings based on whether the ThemePicker
component is availalable. Also update dashboard summary for display.

Bug: 129874298
Test: m RunSettingsRoboTests
Change-Id: Id7e0bb9cbc689bb9e637919a10a7d1006397afab
2019-04-09 13:25:57 -04:00
Christine Franks
84e67e1f72 Use CDS display white balance getter and setter
Bug: 123930917
Test: make ROBOTEST_FILTER="(DisplayWhite*)" RunSettingsRoboTests -j48
Change-Id: Iafc6ff9a61b69baf03efddd52687093c55d35178
(cherry picked from commit ebacc33852)
2019-04-05 21:36:34 +00:00
Salvador Martinez
1053ec04b4 Update dark theme to have new screen
The dark theme preference should have it's own screen rather than
being a dialog. This adds some boilerplate code that will be
needed for the illustration as well as converting the current
list preference to open a new screen.

Test: robotests
Bug: 128686189
Change-Id: I5b62276353c0d39ad2ad00d21d2280e76cceb09b
2019-03-26 13:17:11 -07:00
Ryan Mitchell
5f6924761e Fix Settings test that uses OverlayInfo
Now that targetOverlayableName has been added to OverlayInfo, the tests
that construct the info objects must be fixed.

Bug: 128830059
Test: atest SettingsRoboTestStub
Change-Id: I2cee25e417ec643f758ebe40551cc97b1f0828ac
2019-03-22 08:15:44 -07:00
Issei Suzuki
fd85a9fae6 Move AmbientDisplayConfiguration class out of internal package.
Test: m droid (run full build)
Bug: 126327497
Change-Id: Idc07c811864edb4f88151051e25d6e05e4caf3b2
2019-02-27 13:25:15 +01:00
Alex Salo
bb4e9ce201 Add "Adaptive sleep" setting
Adaptive sleep setting, if enabled, will perform an attention check
right before the power manager is scheduled to dim and then turn off the
display. If the attention check says that user is currently paying
attention to the device, the screen sleep timeout timer will be reset,
as if user had interacted with the display.

The animation and explanation strings are still TBC per UX team.

The setting is only displayed on supported devices.

Test: make RunSettingsRoboTests
Bug: 111939367
Change-Id: I191dd8ef06ecec4edbe4357671a7a9360971c06f
2019-01-28 11:39:00 -08:00
Christine Franks
ade7d943c3 Move color modes to ColorDisplayManager
Bug: 123352608
Test: make RunSettingsRoboTests

Change-Id: I3c054fa0cca4bbd1c955ef03d1733320ffe9e0f0
2019-01-24 10:57:30 -08:00
Christine Franks
5405d71616 Use ColorDisplayManager for night display
Bug: 111215474
Test: make ROBOTEST_FILTER="(Night*)" RunSettingsRoboTests -j48
Change-Id: I8b92407470446ef86e460985fc64cf2467eb3e5c
2019-01-23 13:32:30 -08:00
Lucas Dupin
a1916172d8 Night mode wording
Renaming to 'theme' per UX recomendation

Change-Id: I80817ea3778715c3514205ede738f70d92fa15e9
Fixes: 123042258
Test: manual
2019-01-20 14:56:04 -08:00
Fan Zhang
69e4302d40 New approach to override timeout max value
- Revert "Allow OEM customizing max screen timeout value."
- Use separate timeout list for screen timeout and lock timeout.

This reverts commit f57f490aa6.

Fixes: 113346164
Test: manual

Change-Id: Ifbb054c232c47455ae82e3ed817f9c1e96f694cf
2019-01-16 13:59:10 -08:00
Daniel Solomon
6f8934bf3a Merge "Hide display white balance setting depending on color mode" 2019-01-15 19:29:16 +00:00
Fan Zhang
f57f490aa6 Allow OEM customizing max screen timeout value.
Side fix - update string for select timezone.

Change-Id: Id61128b7dfcc27da8ed07225af3b6bec4e93b512
Fixes: 113346164
Fixes: 121986474
Test: robotest
2019-01-09 11:19:48 -08:00
Daniel Solomon
60418b4de8 Hide display white balance setting depending on color mode
Display white balance relies on a linear color transform matrix to work
as intended. When the current color mode is COLOR_MODE_SATURATED, this
condition is not guaranteed to be satisfied. In this case, hide the
display white balance setting.

Bug: 116516917

make ROBOTEST_FILTER=DisplayWhiteBalancePreferenceControllerTest
RunSettingsRoboTests -j32

Change-Id: I1fe1eb907485766888832db8b9c342339cc80ea7
2019-01-07 14:44:21 -08:00
Christine Franks
a226307b17 Add display white balance setting
Bug: 111215474
Test: make RunSettingsRoboTests -j100
Change-Id: Icf31ff820008740312ad811d0eda72fd3fb90a63
2018-12-21 09:16:01 -08:00
Ben Lin
11f698ba22 Add boolean flags to show/hide top-most settings.
Bug: None
Test: RunSettingsRoboTests
Change-Id: Ib576f5979feda0fa7f573915acffc5065d40095c
2018-12-14 16:00:21 -08:00
James Lemieux
f1dade40d2 Use binary resource support in robolectric
The resources available to tests are now exactly the merged resources
located in the APK under test.

Bug: 74359828
Test: make -j56 RunSettingsRoboTests
Change-Id: I050db81a92decefea23314b5ec7a62f77ff4bb2b
2018-12-12 19:53:49 -08:00
Salvador Martinez
42e9d26635 Allow appending static preferences to RadioButtonPickerFragment
This makes it so that static preferences can also be added after
the candidates so they can show up on the bottom of the screen.
This is done via a new xml tag for the preference screen that
is usually mostly empty that RaiodButtonPickerFragments use

Test: robotests
Bug: 111450127
Change-Id: I0fe2f480f0ff59b9bf9269e94b33ab4b008b47b8
2018-12-06 14:03:08 -08:00
tmfang
dce94bb237 Use SettingsLib's LayoutPreference
- Remove LayoutPreference in Settings source code.
- Remove unused style, layout
- Replace old imports to com.android.settingslib.widget.LayoutPreference
- Replace old XML tag to com.android.settingslib.widget.LayoutPreference

Test: robotest, manual test
Bug: 120005054
Change-Id: I9ae1ae14a16f443e11ac5d75b6038c7c5e253844
2018-11-27 13:12:53 +08:00
Christine Franks
26d0595373 Use ColorDisplayManager
Bug: 111215474
Test: make RunSettingsRoboTests -j100
Change-Id: I78bb44a1c4824f2b5223ca0d58ad224b96591d9a
2018-11-06 21:31:28 +00:00
Fan Zhang
0023558ec3 Fix Display settings summary when there is no wallpaper.
Change-Id: I715cef9dc42de1231491b5a7184f0f151d94af11
Fixes: 69905032
Test: robotests
2018-10-30 10:10:30 -07:00
Fan Zhang
9aca4cb48c Add config to disable app tray preview in display size.
Also move some files

Change-Id: I4636fcd81425991acadede0b703e09513c82543c
Fixes: 113374067
Test: robotests
2018-09-10 15:03:54 -07:00
Philip P. Moltmann
e3f721132a RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.

This causes a lot of trivial code changes.

I also updated the ordering of the imports in all affected files.

Bug: 110953302
Test: Built
      make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
2018-08-30 08:11:39 -07:00
TreeHugger Robot
a3738857da Merge "Add null check for vrManager" 2018-08-29 10:02:09 +00:00
Fan Zhang
23f8d59d02 Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
2018-08-28 22:13:15 +00:00
Rick Yiu
bad519d0a4 Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.

Test: robotests
Bug: 112064298
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
2018-08-28 16:03:40 +08:00
jackqdyulei
076b674764 PowerUsageSummary: move controllers to xml
Also change the following controllers to have standard constructor
1. BatteryHeaderPreferenceController
2. BatteryTipPreferenceController

Change-Id: I2e68082295eb8ef18de9fef9483a10b070c77a47
Fixes: 111131567
Test: robotest
2018-07-26 11:40:28 -07:00
tmfang
f12e6adcdc Settings Fragment Migration (Fix test cases)
Fix all Roboletric test cases.
In this CL, some test cases are broken.
So, We ignored these test cases temporarily.

Test: make RunSettingsRoboTests -j56
Bug: 110259478
Change-Id: I1a3075438a614432a2de4f2d96d8abf9a83ce58c
2018-07-11 18:24:51 -07:00
tmfang
99cc23d0da Settings Fragment Migration (Change imports)
This commit *only* changes imports and optimize imports.
We don't do anything else.

This patch can't compile pass and run test case.
We will update other patches to fix these problem.

Change list.

1. import android.app.Fragment; ->
   import androidx.fragment.app.Fragment;
2. import android.app.DialogFragment; ->
   import androidx.fragment.app.DialogFragment;
3. import android.app.ListFragment; ->
   import androidx.fragment.app.ListFragment;
4. import android.app.LoaderManager; ->
   import androidx.loader.app.LoaderManager;
5. import android.content.AsyncTaskLoader; ->
   import androidx.loader.content.AsyncTaskLoader;
6. import android.content.Loader; ->
   import androidx.loader.content.Loader;
7. import android.app.FragmentTransaction; ->
   import androidx.fragment.app.FragmentTransaction;
8. import android.app.FragmentManager; ->
   import androidx.fragment.app.FragmentManager;
9. import android.app.LoaderManager.LoaderCallbacks; ->
    import androidx.loader.app.LoaderManager.LoaderCallbacks;

Bug: 110259478
Test: Can't test it.
Change-Id: I0a3f98fff34a3494a839c3c42aeabcec3df2c8b3
2018-07-11 18:23:51 -07:00