Commit Graph

559 Commits

Author SHA1 Message Date
Yi Jiang
ca6c548a67 Hides Screen Attention setting when AttentionService isn't installed.
Bug: 191696609
Test: make RunSettingsRoboTests

Change-Id: I5a38b023db91202801a8a3e975f562ddcfe6696e
2021-06-22 00:54:10 -07:00
Abel Tesfaye
b8c610b188 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev 2021-06-16 17:25:48 +00:00
Abel Tesfaye
5131c691b5 Check in auto rotate settings summary for rotation resolver service
Fixes issue where summary text would not properly describe the state of
camera based auto rotation when permission is missing or when another state is blocking the feature

Bug: 190095500
Test: locally with flame & make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceControllerTest
Change-Id: I7609ca87658e08831f3bc37c839f00f63946ddec
2021-06-10 17:31:39 +00:00
Abel Tesfaye
384bed509c Fix battery saver not disabling adaptive sleep switch
Test: locally with flame

Bug: 189900026
Change-Id: I1f0bc5eb1cd021f1eb8526c020f772ce0dd96da0
2021-06-09 23:11:57 +00:00
Abel Tesfaye
c89b3afef5 Merge "Fix for Smart auto rotate text summary not updating after QS toggle is modified" into sc-dev 2021-06-07 17:11:13 +00:00
TreeHugger Robot
8d9d889a8e Merge "Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController" into sc-dev 2021-06-04 18:31:03 +00:00
Abel Tesfaye
4763e1f16b Fix for Smart auto rotate text summary not updating after QS toggle is modified
Test: locally with flame

Bug: 190198617
Change-Id: I7f896cd5e9bdd0974775eff01120527602662c5b
2021-06-04 18:00:21 +00:00
Abel Tesfaye
040e5ef894 Merge "Use list+ toggle on devices without face detection" into sc-dev 2021-06-03 16:40:58 +00:00
Abel Tesfaye
faaf8d5af1 Use list+ toggle on devices without face detection
Test: verified intended behavior on crosshatch and no regression on flame, make RunSettingsRoboTests -j$(nproc) ROBOTEST_FILTER=SmartAutoRotatePreferenceFragmentTest

Bug: 181299673
Change-Id: Ic9f44091e95915bc78bc70b86d7f132ba6e159ed
2021-06-02 19:25:59 +00:00
Abel Tesfaye
a9ddae85e1 Fix LifecycleObserver implementation in SmartAutoRotateBatterySaverController
Test: locally with flame, make RunSettingsRoboTests -j96
ROBOTEST_FILTER=SmartAutoRotateBatterySaverControllerTest,SmartAutoRotateControllerTest

Bug: 188448874
Change-Id: I30ad19da617a166989e9c93e8d2b19263d58419f
2021-06-01 23:45:43 +00:00
Stanley Wang
9b6ead8de7 SettingsMainSwitchPreference should display the restricted icon
if it is restricted.

- Use the RestrictedPreferenceHelper to check the restricted state.

Fix: 179245126
Test: rebotest and see the UI
Change-Id: I3c0e3bd0f3596d6fa548b6f8f10e4d12e7e50c9a
2021-05-31 14:49:48 +08:00
Abel Tesfaye
3b3187b313 Merge "Update battery saver string and make r lowercase in Auto rotate" into sc-dev 2021-05-26 17:26:31 +00:00
Abel Tesfaye
0465239d4a Update battery saver string and make r lowercase in Auto rotate
Bug: 188843414
Test: none
Change-Id: I449fbe3d67eafb9ccdcef7719abdeb31eeb69b3f
2021-05-25 19:07:30 +00:00
Yi-Ling Chuang
eed791e238 Suppress shared axis transition on Brightness level
The brightness bar is a dialog activity. If the shared axis transition
is applied, we'll see an empty page appears with a seek bar on the top,
which is not ideal. Hence, suppress the transition to keep the original
behaviour.

Fixes: 189076430
Test: robotest and test on the brightness level
Change-Id: I1572c31f09d8c6bb3b2c906f6211ed9b97024439
2021-05-25 19:05:42 +08:00
Yi Jiang
8aaa9f5549 Defers initialization of preferences.
In Screen Timeout Settings, preferences should not be initialized in
onAttach() because the setting style hasn't been loaded yet. This change
defers the initialiaztion of those preferences so that they appear
correctly.

Test: manually tested.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540

Change-Id: I86cfe196549d709ed763faa004fff7b631365b1e
2021-05-19 12:18:23 -07:00
ykhung
a3d3c22a27 Add metric for new battery relative functions for S (1/2)
Reference the table from PM requested:
https://docs.google.com/spreadsheets/d/1TC_6MLVMvOS0p1ic0wPfQ-19AOuY8Kc8FUJdqaQSM4I/edit?ts=6098b296#gid=0

Bug: 188505537
Test: make SettingsRoboTests
Change-Id: I2a4df9ab900cbeaf9885bb2dbc21ea848920bc81
2021-05-19 12:22:20 +00:00
Matt Pietal
edd1918866 Controls/Pay - Use new privacy setting
Refer to the now centralized Secure setting, instead of local strings

Bug: 188175341
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I5fff84347c369ae94d6c8359cc49dcbcf9b6ee72
2021-05-18 07:55:21 -04:00
Abel Tesfaye
c077b490f4 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev 2021-05-14 15:55:01 +00:00
Abel Tesfaye
44593a8922 Fix issue where smart auto rotate toggle is not disabled
Bug: 187755019

Test: locally on flame, make RunSettingsRoboTests -j96 ROBOTEST_FILTER=SmartAutoRotateControllerTest
Change-Id: I44bbd644515d153c834533fe47b3b2c34cfeaac6
2021-05-13 22:55:06 +00:00
Yanting Yang
b2eb2bbc28 Update homepage summaries for Display and Security
Also clear the redundant strings and tests.

Bug: 183586663
Test: robotests & visual
Change-Id: Iff149ac566c4b42d89810fe389ad4f723765b6b5
2021-05-13 11:55:48 +08:00
Jason Chiu
cb88a7e24d Merge "Redesign homepage IA icon" into sc-dev 2021-05-13 02:59:29 +00:00
Abel Tesfaye
989570a9b6 Merge "Add warning message when power save mode is enabled for attention settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Abel Tesfaye
43905b3459 Merge "Add warning message when power save mode is enabled for smart auto rotate settings fragment" into sc-dev 2021-05-12 19:27:51 +00:00
Jason Chiu
7d9dceadb7 Redesign homepage IA icon
- remove the outer circle of the icons
- tint the icons including injected ones

Test: robotest, visual
Bug: 182870640
Change-Id: If72c37152f4f0d68e25149b11d497eef1c7ece91
2021-05-12 08:37:37 +00:00
Abel Tesfaye
88a773892b Add warning message when power save mode is enabled for smart auto rotate settings fragment
Test: locally with flame, make RunSettingsRoboTests -j96
ROBOTEST_FILTER=SmartAutoRotateBatterySaverControllerTest,SmartAutoRotateControllerTest

Bug: 186690152
Change-Id: Ibac90a4edd4631e8256da79d0594ac7704b5f8f7
2021-05-10 19:30:04 +00:00
Abel Tesfaye
51ce242573 Add warning message when power save mode is enabled for attention settings fragment
Test: locally with flame, make RunSettingsRoboTests -j96 ROBOTEST_FILTER=AdaptiveSleepPreferenceControllerTest,AdaptiveSleepBatterySaverPreferenceControllerTest

Bug: 186690152
Change-Id: I42e018a8cf48166a8250fac9510a8882efb58568
2021-05-10 19:27:17 +00:00
Matt Pietal
a13e30c11a Controls/Wallet privacy settings
Addressing feedback from ag/14353975

Fixes: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I4de5b7f94d4be44820b1fa463d97f4f098f64bff
2021-05-07 14:54:54 -04:00
Yanting Yang
c37abc9edb Merge "Add summary back to the homepage" into sc-dev 2021-05-07 09:00:32 +00:00
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +00:00
Matt Pietal
8850c3c677 Wallet/controls - Migrate existing settings
Step 2 of 2. Move wallet settings from System -> Gestures -> Power
Menu to Display -> Lockscreen. Split the existing sensitivity setting
into two separate toggles to give users better control of their
privacy settings.

Bug: 185597511
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display

Change-Id: Ifc390945a45258bbcc3c0a6ac67a0c4a3f7a9e91
2021-05-06 08:35:13 -04:00
Yi Jiang
d0af03e11c Merge "Fixes NPE in Screen attention setting" into sc-dev 2021-05-06 06:55:33 +00:00
Yi Jiang
f54a2be819 Fixes NPE in Screen attention setting
Bug: 186904496
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=com.android.settings.display
Change-Id: I9bd1e6824e19cf8ea281f7af482d13ef47f36256
2021-05-05 12:06:51 -07:00
Yanting Yang
d1312e8e6e Add summary back to the homepage
Also update some summaries with new strings.

Bug: 183586663
Test: robotests & atest & visual

Change-Id: I692be9b34e8867501aaa8c8e40428870b99644f8
2021-05-06 00:27:37 +08:00
Alex Salo
c26fabff2a Merge "Fix NullPointerException in SmartAutoRotateCameraStateController" into sc-dev 2021-05-05 04:12:38 +00:00
Yi Jiang
18c97b595f Fixes 'no ripple effect' issue for screen attention setting
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

The change ag/14114425 is reverted due to b/186904496. This change
includes a fix for that issue.

Test: manually
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540
Bug: 186904496

Change-Id: I317ce251f4d11e62c6592ee587c2919da4d45db3
2021-05-03 18:02:59 -07:00
bsears
deb2acc9b3 Merge "Revert "Fixes 'no ripple effect' issue for screen attention setting"" into sc-dev 2021-05-03 22:08:44 +00:00
bsears
30e9ba1e52 Revert "Fixes 'no ripple effect' issue for screen attention setting"
This reverts commit 20d1da2b62.

Reason for revert: Based on bisection, this is the likely root cause of b/186904496

Bug: 186904496
Change-Id: I0eaa026b52610d7ef4543c32791531971e68f8e6
2021-05-03 17:59:11 +00:00
Yichi Chen
ffbea30a18 Merge "RefreshRatePrefCtr: Correct the check of peak refresh rate" into sc-dev 2021-05-03 14:59:47 +00:00
Yichi Chen
70a9e8ea3e RefreshRatePrefCtr: Correct the check of peak refresh rate
The peak refresh rate will not be guaranteed to be integer, but
config_defaultPeakRefreshRate only takes integer into the comparison.
To expose the smooth display is enabled by default in Settings, the
patch corrects the check of peak refresh rate with proper rounding.

Bug: 185102566
Test: Enable smooth display by default in Settings
Change-Id: I658ce22cf0b0a108c4b721e3e5320caf9c379639
2021-04-29 23:34:12 +08:00
Yi Jiang
20d1da2b62 Fixes 'no ripple effect' issue for screen attention setting
Preferences shouldn't be initialized at onAttach() because the settings
style hasn't been loaded yet. This change defers the preferences
initialization so that they comply with the settings style.

Test: manually
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.display
Bug: 183909540

Change-Id: I4dc4503924a1dcd5b8d41f7d27e576befb11f976
2021-04-29 01:28:35 -07:00
Abel Tesfaye
0f402e0cae Fix NullPointerException in SmartAutoRotateCameraStateController
Test: none

Bug: 184844470
Change-Id: I9eca78b11ff8a70dc7c026d7ef77e0b08db8ffbe
2021-04-27 20:24:30 +00:00
Santos Cordon
219dabcabf Merge "Use new getBrighntessInfo() API for brightness" into sc-dev 2021-04-24 15:38:20 +00:00
Christine Franks
10da1de13e Merge "Support vendor modes in color mode preference" into sc-dev 2021-04-23 06:31:18 +00:00
Santos Cordon
8dcffb88cf Use new getBrighntessInfo() API for brightness
The slider and settings need to use the new brightness
api so that:
1) It can work for mutiple-displays that support brightness
2) Can work with high-brightness mode which can dynamically
adjust the brightness min and max.

Bug: 168210311
Test: Verify that slider can go to 100% with HBM on or off.
Test: atest com.android.settings.display
Change-Id: I01029e211f64f0a8598b1388dd3bb535eb0beb69
2021-04-23 05:28:54 +01:00
Christine Franks
cd61dd3359 Support vendor modes in color mode preference
Bug: 161299146
Test: atest SettingsUnitTests:ColorModePreferenceControllerTest and
atest SettingsUnitTests:ColorModePreferenceFragmentTest

Change-Id: I76ed54bb444170d4b8935f8f12bed599a946aa14
2021-04-22 16:50:43 -07:00
Evan Severson
cbc3bc5acd Merge "Update mic/camera toggles api" into sc-dev 2021-04-22 16:38:35 +00:00
Alex Johnston
2f9b5b6ad7 Merge "Fix maximum time to lock" into sc-dev 2021-04-21 09:17:28 +00:00
Alex Johnston
e9717d265e Fix maximum time to lock
Changes
* Restore previous timeout behaviour. This
  behaviour was modified in Android S and
  was previously working on Android R.
* If the selected timeout is less than
  the max timeout set by the admin, select
  the largest possible timeout.
* If there are no possible timeouts for the
  user, disable the preference.

Manual testing steps
* Download CtsVerifier and CtsEmptyDeviceOwner apks
* Set device owner
* Run Policy transparency test > set max time to lock
* Set max time to lock and verify correct value is
  shown in Settings. Compare behaviour with Android R.

Bug: 184104507
Test: manual testing
      atest com.android.settings.display.ScreenTimeoutSettingsTest
Change-Id: I8d0e66ccce14cca244bcd380fd225a31df0b8999
2021-04-21 08:09:25 +00:00
Evan Severson
5087e71b59 Update mic/camera toggles api
Test: Build
Bug: 181681375
Change-Id: I8c2cdc76490424e1bcaac93daefb3676e51de8ca
2021-04-16 14:14:12 -07:00
Abel Tesfaye
5d6438391f Add warning message when camera privacy lock is enabled for screen attention settings
Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=AdaptiveSleepCameraStatePreferenceControllerTest,
AdaptiveSleepPreferenceControllerTest

Bug: 177462182
Change-Id: I9880d6b82e9a5040534aceda4ff15275e0bcf72a
2021-04-08 19:40:58 +00:00