Commit Graph

205 Commits

Author SHA1 Message Date
Tsung-Mao Fang
00956fb4e1 Apply top intro preference in Settings app (1/n)
Based on content in footer, we need to convert some footers
to top info prefernce.

Test: Run robo test and see the screens
Bug: 173087905
Change-Id: Ie62a503481f9d385f5468896fba8f607cb3437d3
2020-11-16 18:44:40 +08:00
Edgar Wang
391217977f Update the summary of AoD when Bedtime mode is on
Since Bedtime mode can suppress AoD, after reviewed by UX, we decide
update the summary to "Unavailable because Bedtime mode is on" when AoD
is suppressed by Bedtime mode.

Bug: 168790245
Test: manual & robotest
Change-Id: Id2511cb0ad93b44f6bf701a707b7ddef9438653d
2020-11-12 21:47:15 +08:00
Yi Jiang
a56be2d614 Hides Screen Attention setting on unsupported devices
Bug: 170971817
Test: make RunSettingsRoboTests
Change-Id: I8aa7882be9a1ae483e8e7500059a18859b20d42b
2020-10-29 13:16:48 -07:00
Mill Chen
ad99e2ef38 Update related UI if battery is not present
This change is to update the related UI in the battery page if the
battery is not present. This includes the following updates:
1. Update the summary of battery tile in the Settings homepage
2. Replace the battery level with "Unknown"
3. Replace the summary with help message in the battery page
4. Remove the battery meter icon

Bug: 171368508
Test: verify on an issue device
Change-Id: I892e0d137143160a0bce0c11ce9265120ebb8fd4
2020-10-23 23:35:15 +08:00
Yanting Yang
9aa4a5463f Remove subtitles for the homepage IA
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
2020-10-20 23:54:03 +08:00
Yi Jiang
f5d1841c9d Merge Screen Attention and Screen timeout Settings.
Bug: 155051311
Test: atest
Change-Id: I6f6ee52618eab629a41b28982be32ead5f9ba08d
2020-10-13 00:47:13 -07:00
Wesley.CW Wang
ff0e65c7f7 Add intent extra when launching WallpaperPicker from SUW and Settings
- Add extra to these intents to help WallpaperPicker log the launch
 source

Bug: 154781896
Test: make SettingsRoboTests
Change-Id: Ifb0ed22ab8ebfbb3c2ad24e9b7bad80007162b6e
2020-09-23 08:06:52 +00:00
Yi Jiang
038d18ff73 Disable screen attention when DISALLOW_CONFIG_SCREEN_TIMEOUT
Test: atest AdaptiveSleepDetailPreferenceControllerTest
Bug: 161938926
Change-Id: I4ed96ad36efe67091a26cbfe2cde16c116f7c8fb
2020-09-10 00:58:03 -07:00
Matthew Mintz
3243920695 Make WallpaperPreferenceController available when only style picker present.
WallpaperPreferenceController prefers the style picker over the basic wallpaper picker. However, the entire setting is disabled when only the style picker is available, even though the basic wallpaper picker is not used. This change corrects that.

Fixes: 162395248
Test: Added unit tests. Also built, flashed and tested setting with all four combinations of CategoryPickerActivity and CustomizationPickerActivity enabled/disabled.
Change-Id: I4184f834ed771359cef13b64aacf2072e592d6d8
2020-07-29 17:39:47 +08:00
Sunny Shao
8d74809e96 Fix the Night Light page UI shrinking
- This problem causes the TwilightLocationPreferenceController too late
  to decide the preference display or not.
- Move the display criteria into the getAvailabilityStatus

Fixes: 159032276
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Test: manual review
Change-Id: I5850479e8a891f837c0e6772ad1096e702f95e34
2020-06-24 12:22:59 +00:00
TreeHugger Robot
16e1cd296a Merge "Add new Always on display slice" into rvc-dev 2020-06-17 12:04:21 +00:00
Edgar Wang
e1186254d4 Add new Always on display slice
Currently we create Always on Display slice through
AmbientDisplayAlwaysOnPreferenceController. However, as the Always on
Display is merged into Idle lock screen, the conversion won't work
properly anymore when devices support the aware sensor.

Hence, we create another custom slice for this purpose.

Bug: 145920511
Test: manual & robotest

Change-Id: Ifd90e2de5219bd4e97aa13b5855fdab95ff6c4d0
2020-06-17 07:52:01 +00:00
Jay Aliomer
57cc7d01ae Incorrect localization of dark theme custom time
Fixes: 154361883
Test: manually select dark theme custom time and make sure it matches
locale

Change-Id: I2a918b4b2f5aad6b04d3b0318bbca25e82dfae78
2020-05-28 12:00:17 -04:00
Amy Hsu
7730d301b7 Move PeakRefreshRateController to Settings app
1. 60/90 Hz switch
2. Allow DeviceConfig to change default refresh rate

bug: 139869828
bug: 137064289
bug: 132750102

Test: Check refresh rate is expected.
Change-Id: Ia6a3e3717fd8845c7177e55b70bc6d2d952d58f3
2020-05-19 21:45:33 +08:00
Jay Aliomer
dba11e82b5 Revert "Revert "Unable to select twilight scheduling after enabling location""
This reverts commit 782438347b.
Bug: 153115261
Reason for revert: fixing tests

Change-Id: I497a2b83cbe3eaee5f5fb3eb4df73618130fc6e2
2020-05-14 15:14:18 +00:00
Tsung-Mao Fang
ae9dc54c56 Remove duplicate result for dark mode
We only keep the one in display settings.

Test: robo test and search dark mode in settings search.
Fix: 155735315
Change-Id: I71041f473944e854ef4601063658021bb9411069
2020-05-05 21:08:37 +08:00
Jay Aliomer
b4ee096a54 Failed ROBO tests
Modified and removed test to fix errors
a test was removed because it depends on static code

Test: robo tests
Fixes: 154566007
Fixes: 154566012
Change-Id: I66e03469ba2a14f2eb82842a92f64f26eaf21b65
2020-04-22 23:08:06 -04:00
Sunny Shao
5094248487 Ignore a lot of failed roboletric test cases
Bug: 154568213
Bug: 154568594
Bug: 154567856
Bug: 154566065
Bug: 154566012
Bug: 154566007
Bug: 154564960
Bug: 154564366
Bug: 154564361
Bug: 154564994
Bug: 154563784
Bug: 154564243
Bug: 154563562
Bug: 154564136
Bug: 154564211
Bug: 154563778
Bug: 154563910
Bug: 154562715
Bug: 154563116
Bug: 154562264
Bug: 154562785
Bug: 154563290
Bug: 154561690
Bug: 154562361
Bug: 154560878
Bug: 154560145
Test: make RunSettingsRoboTests
Change-Id: I220540d519b222ad7d3b69070a9262bb25f22d23
2020-04-21 15:00:30 +08:00
Jay Aliomer
59c03c23b7 Turn on location dialog when using twilight scheduling
Night light and Dark theme scheduling does not work when in
twiligth mode. For the reason, we added a dialog to inform the user
that they need to turn on location services first.

Fixes: 153115618
Fixes: 153115261
Test: manual
Change-Id: Iea51018a7caba5c0ec93e058ee047d067bc03867
2020-04-03 03:45:20 +00:00
Fiona Campbell
bf6624b603 Fix displayed brightness value in settings.
Change BrightnessLevelPreferenceController to use float values for
brightness instead of the int system.

Change tests to use correct values and floats.

Bug: b/150099686

Test: m -j99 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.BrightnessLevelPreferenceControllerTest",  manual

Change-Id: I1a6e06b4f5532b641d766f770be351b8ca827664
2020-03-19 11:28:44 +00:00
TreeHugger Robot
6aa40f6ea7 Merge "Revert "Ignore some failed tests."" into rvc-dev 2020-03-11 03:16:49 +00:00
Yi-Ling Chuang
ef4550c504 Revert "Ignore some failed tests."
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
2020-03-11 03:16:33 +00:00
TreeHugger Robot
2093ad6ac0 Merge "Ignore some failed tests." into rvc-dev 2020-03-06 09:23:35 +00:00
Yi-Ling Chuang
db4fd2b1c3 Ignore some failed tests.
These test failures may relate to change of PowerManager. Ignore them
first and will have people working on the fix.

Bug: 150914017
Test: robotests
Change-Id: Id4d3bb9945a993517964376b5d52e31dd293e634
2020-03-06 15:20:09 +08:00
Yi-Ling Chuang
91ec8ce068 Fix AdaptiveSleepPreferenceControllerTest.
Fixes: 150910069
Test: robotests
Change-Id: Ie8c33533747d17ec4f0571f5c7ea2de82ce7c66e
2020-03-06 12:14:01 +08:00
Yi Jiang
7f4a4ce85d Hides screen attention when attention service is not avaliable.
If a wrong attention package is pushed to users devices, the screen
attention won't work. In this case, we should also hide the settings
as well.

Test: atest AdaptiveSleepPreferenceControllerTest
Bug: 148099790
Change-Id: Ieb4fd1008856024c23624f0eab3dfbfc3fc4ee3b
2020-02-19 11:57:28 -08:00
Edgar Wang
0934babbfc Make the fragment title can’t searchable
we shouldn't take users so deep into the settings IA because it's easy
to feel lost in settings after clicking on a result without additional
context.

Bug: 143055215
Test: robotest & manual
Change-Id: I337cb5ead31e1e4e7bf9be78132e90630f83ee43
2020-02-06 19:07:11 +08:00
Jay Aliomer
c31c35fb19 Custom dark theme scheduling
allows the use to set the start and end automatic dark theme
activation within a day.

Test: run all settings tests
Change-Id: If96fc050159724d553acb09c2da4fab1d5ff519f
2020-01-14 16:31:29 -05:00
Sunny Shao
7f086c0e81 Refine the DarkModeScheduleSelectorController
- move the initial part to the displayPreference.
- use indext compared instead of the direct string compared.

Bug: 141567787
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=ROBOTEST_FILTER=com.android.settings.display
Change-Id: I49ccc248bc1f5f9659f8543793ea502ac3e2ea6f
2019-12-17 13:15:11 +08:00
Automerger Merge Worker
833c578b01 Battery saver mode should disable dark mode modification am: 5fb68ae95d
Change-Id: I9b4b1dace76a6194fafe27e624465c3c05823bb1
2019-12-03 19:34:32 +00:00
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
Yi-Ling Chuang
31719321af Make some display related slices public.
Only PreferenceControllers with isPublicSlice() set to true are exposed
to other apps. Others will be Settings only.

Bug: 141088937
Test: robotests
Change-Id: I2a36da4ac4bb14a4d2ac7b89ab2bb3ebf8e655f7
2019-11-28 14:29:33 +08:00
Jay Aliomer
a377b5c4aa Fix Master: 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: Iee5d020ac6ea093be712a4f191d4601c9d4617fa
2019-11-25 18:03:29 -05:00
Preston O'Neal
a8ebfe6d75 Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev am: a3e26f10f2
am: 1a67e3048e

Change-Id: Ice680ada896b5b0d954e7e4b0c6318a9adfd23d0
2019-11-24 04:57:03 -08: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
Jay Aliomer
0828e6be9c 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
2019-11-19 11:48:36 -05:00
Amin Shaikh
be8345e565 Add theme component options to settings keywords.
Fixes: 135521048
Test: mp settingsg; search for keywords
Change-Id: Ic2c2827fd5b6eff3b8cc11dc5201fc7c4d55778f
2019-07-02 13:33:46 -04:00
Yi Jiang
5bb10c46d2 Merge "Move the permission warning message to corresponding layout file." into qt-r1-dev am: 575bdfcaad
am: 7810fcc70c

Change-Id: Idd3f3e0eca13a82266e70af2a114f703e814ecdf
2019-06-14 16:03:20 -07: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
tmfang
24c3324268 Use FooterPreference in xml explicitly
We don't rely on FooterPreferenceMixinCompat
to create footer preference in dashboard fragment.

Instead, declare a FooterPreference explicitly in
xml of screen.

It makes more sense for our referenceController design.

Test: visual, robotest
Bug: 124129485
Change-Id: I0b0c0f9e38d85aa89b815ce2b84ddff30a1d206b
2019-06-13 18:29:37 +08: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