Commit Graph

351 Commits

Author SHA1 Message Date
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
31b210017b Migrate all MetricsProto enums to SettingsEnums
Bug: 122855168
Test: rebuild
Change-Id: I962d9a71179f86b7cae9dc5e9a00e0aa1557dc76
2019-01-17 14:55:42 -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
Christine Franks
c4be214f47 Merge "Move color management check to ColorDisplayManager" 2018-12-05 16:29:51 +00:00
Stanley Wang
da296233bc Fix adaptive brightness not appearing in Settings search
Change-Id: I33ed525b3c051a982869114754bd3b7423b61d22
Fixes: 117449384
Test: manual
2018-11-29 18:56:39 +08:00
Christine Franks
bce91d9418 Move color management check to ColorDisplayManager
Bug: 111215474
Test: make RunSettingsRoboTests -j100
Change-Id: I8ab675a49e119014e59fcfdb61fcd9253e8c0da1
2018-11-28 13:09:47 -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
Peiyong Lin
0a16997fe9 [Settings] Use 1030 opcode, deprecate 1024.
Previously we separated wide color gamut out of color management and added a
new opcode 1030 to query whether the device's built-in display is color
managed. This patch deprecated 1024 opcode.

BUG: 111505327
Test: Build, flash, boot and check Settings>Display>Color
Change-Id: Ifaf03d02d21c47b7b3be987ceaabb61fa4449c8c
2018-10-24 18:23:01 -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
Fan Zhang
9ce4a1fcde Use searchable="false" to suppress nonIndexables.
When possible, remove or simplify getNonIndexable() logic in fragments,
and use searchable="false" in xml to suppress index.

Change-Id: I5bdf5bc7d5494a64cdd9e230a51321a4b210af69
Fixes: 112608186
Test: robotest and manual search
2018-08-17 09:21:05 -07: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
Fan Zhang
176ccd0c35 Clean up: fix incorrect @VisibleForTesting imports
Test: rebuild and robotests
Change-Id: I33d7ee1c0622c01f592920baaf01d44ad19d9a13
2018-07-13 13:08:53 -07:00
tmfang
27c84de325 Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
2018-07-11 18:24:51 -07:00
TreeHugger Robot
7b52cb3059 Merge "Update auto brightness pref summary to show on/off" 2018-07-10 20:36:44 +00:00
Fan Zhang
b0eab98754 Update auto brightness pref summary to show on/off
Change-Id: I7914957cc9dbffcc12e34fc714bb9c37783a4f33
Fixes: 109885418
Test: robotests
2018-07-10 11:27:25 -07:00
Fan Zhang
d7d1e8063a Fix NPE when querying AmbientDisply through ExternalSeting
Bug: 110403709
Test: manual
Change-Id: I5c037b010e296cbd011f8c141932e6befd341c99
2018-07-09 17:35:35 -07:00
TreeHugger Robot
0da46d618e Merge "Fix NPE when querying AmbientDisply through ExternalSeting" 2018-07-09 17:45:34 +00:00
TreeHugger Robot
9fa595f9c2 Merge changes from topic "q_dark_theme"
* changes:
  Move NightMode to Display settings
  Revert "Setting to change sysui theme"
2018-07-05 03:46:24 +00:00
Fan Zhang
b80aee943c Fix NPE when querying AmbientDisply through ExternalSeting
Bug: 110403709
Test: manual
Change-Id: Iee9994061c2b5c4bdd7aefe2d25a73e8ed4c9db0
2018-07-03 13:16:48 -07:00
Fan Zhang
78ea7da54c Misc tweaks to Indexable usage and tests.
- Make SettingsPreferenceFragment implement Indexable directly
- Add existing fragments that are SettingsPrefFragment but not Indexable
  to grandfather list.
- Fix "font size" fragment so it shows up in search properly.
- Remove duplicates for "lock screen display", "Screen saver".

Bug: 70720645
Test: robotests
Change-Id: I44ce0cac0fdf5e882b315861bb4bebc45dbe01e6
2018-07-02 16:46:23 -07:00
Lucas Dupin
a7ea18a6ce Move NightMode to Display settings
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DarkUIPreferenceController
Bug: 110758454
Change-Id: Ie389a0e55eb39f2b43d4e9c0739ad3f61469d740
2018-06-28 14:16:17 -07:00
Lucas Dupin
c74969e7cc Revert "Setting to change sysui theme"
This reverts commit 74fde3ea31.

Reason for revert: CL was intended to be a workaround while we were still working on global theming.

Change-Id: I2c10971b9eab5382c1782c8d09c569edc35ea191
2018-06-28 13:50:13 -07:00
TreeHugger Robot
ce287b9fb6 Merge "Set default display timeout if current value is disabled by admin." 2018-06-26 06:55:48 +00:00
Doris Ling
30692040be Set default display timeout if current value is disabled by admin.
- The display timeout dialog will only show values that are allowed by the
admin. If the current display time out is greater than the max timeout set by
admin, it becomes an invalid selection. In this case, instead of not
selecting anything, set the default to the last available item.
- move TimeoutListPreference into display package.

Change-Id: I6c88f72ff2b0afe8605800074fd4626bbb16bee0
Fixes: 110104437
Test: make RunSettingsRoboTests
2018-06-25 13:44:00 -07:00
Evan Laird
2da76e4e0a Merge "Allow config to disable battery percent setting" into pi-dev am: 1f6c7910fb
am: 77e399335e

Change-Id: I58fa0d9772c01798ada18416bebc7fdd78bd245f
2018-06-21 15:29:56 -07:00
Fan Zhang
7431c91de6 Remove search indexing pipeline from Settings
Index is already handled by SettingsIntelligenec. No longer needed in
Settings.

Change-Id: Id43fb3100dc2759185744441cff8cb9cd2d2da20
Fixes: 69808376
Test: robotests
2018-06-21 09:38:36 -07:00
Fan Zhang
c7162cd24d Reorder and clean up imports.
Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
2018-06-18 15:45:09 -07:00
Fan Zhang
275da6a878 Change display size preview for app icons.
The new UI intentionally does not look like the app drawer from
launcher so user is clear this is a preview screen.

Change-Id: Iba87fab72e77921c1f1014fca24476bd4af2d19c
Fixes: 70043399
Test: visual
2018-06-14 10:35:55 -07:00
Evan Laird
7d9ec632f2 Allow config to disable battery percent setting
Respect config_battery_percentage_setting_available to determine whether
or not to allow showing battery percentage in the status bar.

Test: visual
Bug: 80129194
Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706
2018-06-13 20:13:47 -04:00
Fan Zhang
7f5692bdea Misc search clean up
- Make color mode page searchable and suppress its parent page.
- Suppress entire DataUsageSummaryLegacy page in search. This page will
  be deleted soon

Change-Id: I0f98c9073358934b98e986d034c89a9bf87e58ad
Fixes: 70720645
Test: robotests
2018-06-08 14:51:19 -07:00
Ching-Sung Li
feae5d79cf Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.

Bug: 76167422
Test: RunSettingsRoboTests
Change-Id: I0bddf50d8ea7721fe258a9a9b51f8c56dd5afcce
2018-05-25 12:59:18 -07:00
Lucas Dupin
74fde3ea31 Setting to change sysui theme
Users now can manually pick if they want light or dark QS
and launcher

Change-Id: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes: 63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
2018-05-23 15:20:17 -07:00
Lucas Dupin
b1a2aba01a Setting to change sysui theme
Users now can manually pick if they want light or dark QS
and launcher

Change-Id: Iaabdb32d9af6a293dfbd5ba6dea3da1d38a13ad3
Merged-In: Ic0a43bc5e8777c39bfe5c0bbc606bf6be20f7168
Fixes: 63903361
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemUiThemePreferenceControllerTest
Test: manual
2018-05-23 21:51:32 +00:00
Matthew Fritze
1dd25fd87c Add isSliceable API to BasePrefController
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.

Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.

Test: robotests
Change-Id: I85848c2cdf3e151fa94b33dd1dc5c0374ef94b5b
Merged-In: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
Fixes: 79779103
2018-05-22 22:43:24 +00:00
Matthew Fritze
bf1f5b5813 Add isSliceable API to BasePrefController
Only support explicitly approved Settings Slices,
dictated by controllers which return true for the new
method isSliceable.

Updating the supported settings to a whitelist means that
the method to return all available slices must be updated,
and checking slicability when we index slices.

Test: robotests
Bug: 79779103
Change-Id: Ib2b9690cdd0036b5cc4a1cb846c52bce7c824ab9
2018-05-22 11:06:42 -07:00
Chia-I Wu
72a9730426 Merge "Show color modes from config_availableColorModes" into pi-dev am: 5c99a41a9c
am: 2dc9650a76

Change-Id: Ib248095ea777d13b4449369096953de574c98bb5
2018-05-22 00:31:52 -07:00
Chia-I Wu
d4cfb414c3 Show color modes from config_availableColorModes
Check config_availableColorModes to decide which color mode options
to show.

Bug: 73824924
Bug: 73825738
Test: 2016, 2017, and 2018 devices
Change-Id: I42915595348061ff4b3f2fdf14753e96dfcb2052
2018-05-21 19:58:08 -07:00
Andrew Sapperstein
d497de27c1 Merge "Make the night display suggestion depend on a flag." into pi-dev am: 96294df2f0
am: 95e789dc58

Change-Id: I732a4d92f23354db44ce294096ad1e38ae0f198b
2018-05-17 13:59:26 -07:00
Andrew Sapperstein
96294df2f0 Merge "Make the night display suggestion depend on a flag." into pi-dev 2018-05-17 20:40:21 +00:00