Commit Graph

110 Commits

Author SHA1 Message Date
Andrew Sapperstein
6eafaf46aa Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am: 64b15c4a7b

Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
2017-08-09 13:06:33 +00:00
Andrew Sapperstein
5be6c30012 Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.

Bug: 64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
2017-08-08 13:58:18 -07:00
Geoffrey Pitsch
cf83f9dd12 Merge "AOD setting availability depends on other user settings" into oc-dr1-dev
am: 6d62355313

Change-Id: If6f49df149ebaf960f40336556e5e9c199c23ef2
2017-08-01 14:08:10 +00: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
Andrew Sapperstein
e8e65a367b Add ambient notifications as inline setting.
Bug: 62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
2017-07-26 20:19: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
Doris Ling
0224a409a9 Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev 2017-07-26 04:14:07 +00:00
Doris Ling
3230d95f9c Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I85fb90ad783e5be008c9343a0804893604814bd1
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Merged-In: I1afba6639a2b94f9d57f546c220f417092f92387
Fix: 63939450
Test: make RunSettingsRoboTests
2017-07-25 16:40:30 -07:00
Matthew Fritze
73056522b3 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Change-Id: I8a593d9ff3308b2d0cd5bc65658d160abf55b07e
Fixes: 63955012
Test: robotests
2017-07-25 14:37:05 -07:00
Doris Ling
5df37ec7b9 Disable Wallpaper setting when Wallpaper is disabled.
Check whether the wallpaper picker is enabled in
WallpaperPreferenceController.isAvailable() instead of always returning
true.

Change-Id: I1afba6639a2b94f9d57f546c220f417092f92387
Merged-In: Ie3a4a68b728ccab1a7aa50c0018a5153907c49b4
Bug: 63939450
Test: make RunSettingsRoboTests
2017-07-25 11:33:40 -07:00
Matthew Fritze
458bb887e1 Add default value to inline payloads
If we try to set an inline result when it has not yet been
accessed in settings, nothing is read from Settings.
Thus, include a default value for a fallback.

Manual merge for: ag/2588219/

Change-Id: I3b8eea4f82764852cea642db4455ba57f10a7d37
Fixes: 63955012
Test: robotests
2017-07-25 10:44:15 -07:00
Andrew Sapperstein
36af00bb21 Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-23 06:11:22 +00:00
Andrew Sapperstein
eb1a45b95b Add ResultPayload for always-on ambient display.
Bug: 62022517
Test: robotest
Change-Id: Ib6382030ffa0c159ab6ca4b45dd966ee9287181f
Merged-In: Ib4ee4d8d999e5a1f9edf34ea6068644b41fc4838
2017-07-22 20:57:07 -07:00
Doris Ling
c496421aef Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63872023
Test: make RunSettingsRoboTests
(cherry picked from commit c7d2d270ab)
2017-07-20 17:39:58 +00:00
Rajeev Kumar
7d99df0228 Recycle TypedArray in ConversationMessageView.
Test: make RunSettingsRoboTests -j40
Change-Id: Iaf3f214588f23c232a23ecdadb7fe6222792fada
2017-07-13 19:14:57 -07:00
Geoffrey Pitsch
8d973761ad Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-12 13:42:34 -04:00
Geoffrey Pitsch
57adc290d2 Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.

Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-11 14:05:03 -04:00
Doris Ling
c7d2d270ab Ensure that brightness level is within 0-100%.
Check whether the retrieved brightnesss value is out of range, and
adjust it if necessary.

Change-Id: Ieb1ccc03dcb9fa3e1ed192fcc3d217b84d4d316c
Fix: 63181935
Test: make RunSettingsRoboTests
2017-07-05 12:53:04 -07:00
Andrew Sapperstein
cc7adfd9e0 Merge "Reduce number of wallpaper results in search." into oc-dr1-dev am: 63c63ff640
am: 301dfdd8d1

Change-Id: Iab4d5c24b9ac7cee39af3bcc14631fa09bb455c5
2017-06-29 04:52:32 +00:00
Andrew Sapperstein
ebaab6aabd Reduce number of wallpaper results in search.
Previously we indexed the intent in display settings and every
app that handled ACTION_SET_WALLPAPER. Now, we only index an
app that handles ACTION_SET_WALLPAPER and is the listed package in
config_wallpaper_picker_package.

Change-Id: Ife81702017e3e8be4a754873d9c453fddf1cbd9e
Fixes: 62793068
Test: manual, search wallpaper and observe results
2017-06-28 17:16:57 -07:00
Tony Mantler
1d583e125f Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
2017-06-26 10:58:36 -07:00
Juan Lang
c04c3f7bd7 Use SettingsLib's versions of Custom* classes.
Bug: 30046624
Merged-In: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
Test: make RunSettingsRoboTests
Change-Id: Icd4390c46532bedb3824511867208337c74c00a3
2017-06-21 14:47:37 -07:00
Juan Lang
d5d43ddc77 Merge "Use SettingsLib's versions of Custom* classes." 2017-06-21 21:25:19 +00:00
Juan Lang
4482812cb1 Use SettingsLib's versions of Custom* classes.
Test: make RunSettingsRoboTests
Change-Id: I2584e820b72bb4672c53fd1a9f63c7f1662e0809
2017-06-21 12:07:50 -07:00
Matthew Fritze
6d55297f4f Block inline-results from Settings search
Change-Id: I51ac1d6510bdbd6818c91836117d9ffb059cf4ab
Fixes: 62806412
Test: make RunSettingsRoboTests
2017-06-20 08:16:24 -07:00
TreeHugger Robot
4d256e4080 Merge "Add saturation boost setting" 2017-06-07 02:36:12 +00:00
Romain Guy
305f900bfa Add saturation boost setting
Bug: 62238038 62377592 38225028
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=com.android.settings.display.ColorModePreferenceControllerTest
Change-Id: Iae8f4b25966ff28fde127e6103b2c03c67862cf0
2017-06-06 17:58:24 -07:00
Fan Zhang
179645eecd Add help url placeholders for new pages
Bug: 38412798
Test: visual
Change-Id: I4ede523cb13790ea05309279f80a778b2086f850
2017-06-05 14:50:01 -07:00
Matthew Fritze
2b1a88da3d Simplify InlineSwitchPayloads and generalize get/set method
InlineSwitchPayload now assumes that all switches will be
stored as 1 or 0, which simplifies the code.

Moves Availability into ResultPayload, so that custom
payloads can be created to set/get values which are more
complicated than stotring ints (like bluetooth or DnD),
and give more expressive reasons when unavailable.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I87e6fc041bfd398e7daf6e6e479d502930d36f0f
2017-06-02 08:23:45 -07:00
Adrian Roos
e349ec30d8 AOD: Ambient display settings to dedicated settings screen
Bug: 33279975
Test: make RunSettingsRoboTests
Change-Id: I5f3ddf3b3abfc989907293b4a47b78568c01cf9b
2017-05-30 16:42:37 -07:00
Matthew Fritze
2078bc2358 Remove search2 package and put everything into search
Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes: 38502743
Test: make RunSettingsRoboTests
2017-05-23 13:57:28 -07:00
Fan Zhang
c7d632d313 Use label instead of raw value for theme preference summary
Change-Id: I4dd1c156c8e68dd5567093c56d5e6846357fc2d6
Fix: 38470685
Test: make RunSettingsRoboTests
2017-05-22 13:52:32 -07:00
Fan Zhang
cbfe1eb881 Add title to SeekbarPreference content description.
Adding a title to contentDesciption of the seekbar.
The title is helpful to indicate which seekbar user is changing when
talkback is enabled.

Also move SeekBarPreference from root package to widget packge.

Change-Id: I793f41c4902e350b6bc6d62761362779cc3722a9
Fix: 35421942
Test: make RunSettingsRoboTests
2017-05-16 12:35:45 -07:00
Juan Lang
a5f0a82f8f Merge changes from topic 'footer-settingslib'
* changes:
  Depend on SettingsLib's version of lifecycle and FooterMixin.
  Add a factory method to create a Lifecycle.
2017-05-12 20:24:05 +00:00
Juan Lang
777ed2535a Depend on SettingsLib's version of lifecycle and FooterMixin.
The implementations have been imported into SettingsLib. Setting's copy
can now be removed, which this change also does.

Test: Manually check battery status, which uses FooterMixin, looks OK.
make RunSettingsLibRobotTests && make RunSettingsRoboTests
     && make RunSettingsGoogleRoboTests
Change-Id: I6539605fdad80d156ff5ff249e68df4a1c412067
2017-05-12 11:10:46 -07:00
Adrian Roos
95ff1f4131 AOD: Add temporary always-on setting
Adds a setting for controlling always-on ambient display
until the new ambient display settings screen is implemented.

Also updates DozePreferenceController to use the the
AmbientDisplayConfiguration helper instead of recreating that
logic.

Also adds tests for both doze preference controllers.

Bug: 33279975
Test: Toggle "Settings > Display > Always on", verify ambient display is on / off
Test: make RunSettingsRoboTests
Change-Id: If36356bc29329a4e0732e79db662ffb02c9fc189
2017-05-11 17:15:20 -07:00
Fan Zhang
0498d4e864 Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
am: df2ecdf3f0

Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
2017-05-08 23:15:04 +00:00
Fan Zhang
86d4d51b62 Fix PrefCategory layout to align text with actionbar title
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix: 38011653
Test: visual
2017-05-08 13:03:46 -07:00
TreeHugger Robot
fa4f30e09f Merge "Use a SwitchPreference for auto-rotate instead" 2017-05-08 18:22:30 +00:00
Fan Zhang
670410c04e Use a SwitchPreference for auto-rotate instead
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change

Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix: 35959797
Test: robotests
2017-05-06 10:42:37 -07:00
Fan Zhang
b2b6f7d20e Misc string updates
- Use BidiFormat wrap dp number
- Update billing cycle starting day string

Change-Id: Ifb57e3bb18ced72f91f30599a2ff7bcfa329630f
Fix: 37353209
Fix: 37657115
Fix: 38005987
Test: visual
2017-05-05 09:31:22 -07:00
Jaekyun Seok
d427f4fef8 Merge "Do not show static overlays as a theme" into oc-dev am: 170acdb79b
am: 4a6781af1b

Change-Id: I2f4b1f9ab7e7947bb5c95aae7d7400113e4c266b
2017-05-02 01:24:29 +00:00
Jaekyun Seok
ef85d880a5 Do not show static overlays as a theme
Static overlays aren't changeable by a user. So we shouldn't list them
as a theme.

This CL fixed b/36812704 as well to run unit tests.

Test: building succeeded and tested on sailfish.
      make RunSettingsRoboTests
      adb shell am instrument -w -e class \
          com.android.settings.display.ThemePreferenceControllerTest \
          com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Bug: 37480890
Bug: 36812704

Change-Id: I8c13b6956083095dceaab3da6642bef1647d6a30
2017-05-02 06:18:48 +09:00
Evan Laird
227affaf29 Cleanup to screensaver settings for O
Reworked the way screensaver settings are laid out for O. Instead of
using the options menu and dialogs to navigate screensaver options,
there are now two rows: one row for the screensaver choice and
optionally its own settings, and one row for the "when to show" setting.
And now there's a nice obvious button you can press to preview your
choices.

Test: 'export ROBOTEST_FILTER="RadioButtonListFragmentTest";\
mmm -j20 packages/apps/Settings/tests/robotests'

Bug: 35031991
Change-Id: Ie7d2055fb45f6dfe72e34cb9598d9a25f7bee75a
2017-05-01 20:08:16 +00:00
Doris Ling
2e4ff90f5a Listen to brigtness updates to update brightness summary.
- add content observer for brightness relates changes, and update the
brightness preference summary when changes occur.
- also check for VR mode and auto brightness mode when reading the
current brightness value.

Change-Id: I611ec77174ab45315ccbee2952bdbc2c9a9cd954
Fix: 37227609
Test: make RunSettingsRoboTests
2017-04-27 10:52:31 -07:00
Doris Ling
3248492fd7 Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev am: 024bc8706d
am: 387b8c0f8e

Change-Id: I6f38e2100fbbfa30df6e3719cb66062573e54556
2017-04-27 03:31:07 +00:00
TreeHugger Robot
024bc8706d Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev 2017-04-27 03:22:21 +00:00
Doris Ling
cf4a185aeb DO NOT MERGE: Revert "Add summary text to Display->Brightness level."
This reverts commit 03ee253701.

The change does not work properly and is causing confusion.

Bug: 36650108

Change-Id: I00acced742b20e215c869ed58eb8750c654f5742
2017-04-26 21:33:16 +00:00
TreeHugger Robot
1c7e25d3b6 Merge "Remove duplicates between battery and display settings" into oc-dev 2017-04-22 00:56:09 +00:00