Commit Graph

391 Commits

Author SHA1 Message Date
Sunny Shao
1de4c009ea Fix the button display problem in Dark theme page
- Dark theme is disabled when Battery save is on.
- Let dark theme page not be searchable when Battery save is on.

Fixes: 150443799
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display.darkmode
Change-Id: I2674499dd64333825765f70ed1f31dcb83e1b895
2020-03-02 11:59:28 +08:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
2020-02-26 21:46:38 +00:00
Yi Jiang
45733d12bc Merge "Hides screen attention when attention service is not avaliable." 2020-02-20 18:59:08 +00: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
Jay Aliomer
caeb8e0fa8 Merge "Dark theme time format" 2020-02-18 19:44:11 +00:00
Jay Aliomer
a49bb44b10 Dark theme time format
When changing device language, dark theme does not
change the AM/PM format to the proper new language setting

Test: all settings tests

Fixes: 149381251
Change-Id: I68763e24988837f917adad39f82b90e79573fd07
2020-02-18 15:14:51 +00:00
Yi Jiang
8cbebabad6 Merge "Moves Adaptive Sleep's settings from Settings.System to Settings.Secure" 2020-02-12 00:48:59 +00:00
Yi Jiang
63f2c5963a Moves Adaptive Sleep's settings from Settings.System to Settings.Secure
Test: atest AdaptiveSleepPreferenceControllerTest
Test: atest ContextualAdaptiveSleepSliceTest
Bug: 139319542

Change-Id: I9923dc3b6995c89efc1c775ccd2f134af87fc202
2020-02-07 00:44:01 +00: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
e1a2ea3fab Inaccurate auto dark theme time
When changing the start/end custom dark theme time,
The time in the display settings page does not change

Test: settings test

Fixes: 148150281
Change-Id: I4e54797df14cb926f59d50c26e8da160b356f2c0
2020-02-03 17:25:03 -05:00
Jay Aliomer
d810e83a19 Merge "Custom dark theme scheduling" 2020-01-21 21:27:29 +00:00
Edgar Wang
e19ee9a01f Revert "Settings search - Navigate user to exact page"
This reverts commit 08f2a58459.

Reason for revert: design changed, we decide to take the user to
the entry after clicking on a search result.
It's opposite with what we did, so we revert related CL first.

Test: robotest

Change-Id: Iadb9a94a7ef7838be34a54499e2d934d6396c336
2020-01-16 14:07:38 +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
Edgar Wang
08f2a58459 Settings search - Navigate user to exact page
- remove duplicate index preference
- default set searchable = false when the preference has fragment
- make some fragments indexable

Bug: 143057584
Test: robotest & manual

Change-Id: I4d64f6106d2f92f0a45e8c7e26388677f593f412
2019-12-24 21:04:11 +08: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
TreeHugger Robot
190860a35e Merge "Focus remains on the button after turning on/off" 2019-11-27 05:01:09 +00:00
Beverly
a30cb1158f Focus remains on the button after turning on/off
Test: manually test talkback
Fixes: 145181672
Change-Id: I16ceb81dd686e4a18354dfd464c7683ba94df79d
2019-11-26 15:37:42 +00: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
a3e26f10f2 Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev 2019-11-21 22:41:18 +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
48f4e5722e Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev 2019-11-21 21:44:41 +00:00
Jay Aliomer
d385f524f0 DarkUIPreferenceController null exception
The DarkUIPreferenceController doesnt need to show dialog in all cases
we added a null check for mFragment

Fixes: 144899194
Test: atest DarkUIPreferenceControllerTest
Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622
(cherry picked from commit c49f266af0)
2019-11-21 20:07:34 +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
c49f266af0 DarkUIPreferenceController null exception
The DarkUIPreferenceController doesnt need to show dialog in all cases
we added a null check for mFragment

Fixes: 144899194
Test: atest DarkUIPreferenceControllerTest
Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622
2019-11-21 10:48:02 -05: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
Raff Tsai
acd5d10e0d Fix animation in Night light page
Fixes: 143582072
Test: manual
Change-Id: I28c9dd48cec9cfbe76234f8e4b370bc79febe7dd
2019-10-30 13:45:40 +08:00
Raff Tsai
966fa01423 Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId

Bug: 135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
2019-09-25 18:24:56 +08:00
Raff Tsai
ac3e0d0988 Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function

Bug: 135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
2019-09-24 00:35:52 +08:00
Edgar Wang
0f8c7a71d0 Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings

Bug: 136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
2019-09-21 07:19:35 +08:00
Edgar Wang
c3a9fff980 Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings

Bug: 136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
2019-09-21 02:08:36 +08:00
Raff Tsai
1f30b1cd67 Merge similar BaseSearchIndexProvider code together
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
Sunny Shao
4e8081e30a Revert "Fix subtext didn't change after toggle changed"
This reverts commit 5d33399101.

Reason for revert: Subtext must display from its resource xml file, don't just show on/off.

Change-Id: I57a647be1aa2da881caf444c36991da0cdff73f6
2019-09-09 03:05:16 +00:00
Sunny Shao
5d33399101 Fix subtext didn't change after toggle changed
Add the ContentObserver to monitor the key value changed in the Settings.System.

Fixes: 140475264
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I3018498ae32fb282bc180db7864a9813a168b9c0
2019-09-04 18:24:18 +08:00
Al Sutton
0717e24f7d Adapt to refactoring of display config code in SettingsLib
Bug: 139449903
Test: atest SettingsUnitTest SettingsRoboTests
Change-Id: Ic188fdc02c3fa9590be27ad1bc770255e70b6276
2019-08-27 11:20:01 +00:00
Sunny Shao
343c39faee Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the AdaptiveSleepSettings page.

Fixes: 138965988
Test: manual test
Change-Id: If6fba673af304d8522f3b01ac6607cd8a7ead747
2019-08-06 20:50:20 +08:00
Sunny Shao
c83bb787c5 Use FooterPreference in xml explicitly
Removed the FooterPreferenceMixin from the AutoBrightness page.

Fixes: 138916403
Test: manual test

Change-Id: I131d5cede156e2dae890342d5b456f347b025e27
2019-08-05 18:29:01 +08: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
517af83473 Merge "Refresh camera permission status when it changed." into qt-r1-dev am: e342579993
am: 904d1f86d1

Change-Id: Ia2c9b5bcf0cf970ce9909e625a731b6a8921e4c7
2019-06-21 17:36:47 -07:00
Yi Jiang
d66878f8fe Refresh camera permission status when it changed.
Bug: 135497543
Test: Manually tested
Change-Id: I833e1658bc7888557635b764599c7a0baa226612
2019-06-21 15:07:50 -07: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
TreeHugger Robot
9fb76d02bb Merge "Show a 'permission missing' message in Screen Attention settings." into qt-r1-dev 2019-06-11 19:13:45 +00: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
TreeHugger Robot
9eaf5de974 Merge "Hide color mode in search during A11y" into qt-r1-dev 2019-06-10 23:21:06 +00:00