Commit Graph

233 Commits

Author SHA1 Message Date
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
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
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
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
Santos Cordon
219dabcabf Merge "Use new getBrighntessInfo() API for brightness" into sc-dev 2021-04-24 15:38:20 +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
Edgar Wang
817a167416 Apply SettingsPreferenceTheme in Settings
- Set all of preference style inherit from SettingsPreferenceTheme
- Apply to Theme.Settings and Theme.Settings.Home
- Fix robotest failed in ScreenTimeoutSettingsTest

Bug: 185206291
Test: manual & robotest
Change-Id: I855d003b10348569903855fcbf235bc00265658b
2021-04-14 16:36:14 +08: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
Abel Tesfaye
b7a66b3068 Add warning message when camera privacy lock is enabled for
smart auto rotate settings fragment

Test: locally with flame, make RunSettingsRoboTests -j$(nproc)
ROBOTEST_FILTER=SmartAutoRotateCameraStateControllerTest,SmartAutoRotateControllerTest

Bug: 177462182
Change-Id: If443bd2456f3fbe76876777be912b204a50f4088
2021-04-06 19:49:04 +00:00
Kunhung Li
5f2cf8e695 Clear WallpaperPicker task before launch
There are different launch sources to start WallpaperPicker, clear
previous task to prevent keeping old activity.

Bug: 177638480
Test: make RunSettingsRoboTests
Change-Id: Ia4d3d5c7e5df4a5d3acb137f644939c079d5028f
2021-03-18 05:37:14 +00:00
Abel Tesfaye
e57c87528d Fix auto-rotate summary not updating on devices without smart-auto-rotate
Test: locally with crosshatch

Bug: 181585193
Change-Id: I571b10556ff2f4f4d6ff960fcfdf7866405d5ee5
2021-03-13 02:14:57 +00:00
Abel Tesfaye
a390dc9a42 Fix for NPE in ScreenTimeoutSettingsTest
Test: make RunSettingsRoboTests -j54 ROBOTEST_FILTER=ScreenTimeoutSettings

Bug: 182149244
Change-Id: I22e15c84fa6b0864d35f79df015f1d5b86dec24b
2021-03-08 21:06:26 +00:00
Yi Jiang
bc6ec17120 Adds 'more details' hyper link.
Adds a 'more details' hyper link in the footer when options are disabled
by admin.

Test: make ROBOTEST_FILTER=ScreenTimeoutSettingsTest RunSettingsRoboTests
Bug: 180314728
Change-Id: I880ccd73f4b2ef0b695619ef42ec87559dc2b65b
2021-03-04 01:19:50 -08:00
Ben Murdoch
a9f0903581 Merge "Correctly select peak refresh rate." into sc-dev 2021-02-22 12:43:08 +00:00
Ben Murdoch
38567b98d4 Correctly select peak refresh rate.
Currently we will get an arbitrary value that is greater than the
default depending on the order returned by the Display.

Bug: 180723012
Test: make RunSettingsRoboTests
      ROBOTEST_FILTER="com.android.settings.display.PeakRefreshRatePreferenceControllerTest"
Change-Id: Id2c99f2bea9c6b2814d82a9db3a417e4a93ee06d
2021-02-19 22:31:12 +00:00
Abel Tesfaye
ed7673eadd Check for available rotation resolver service and camera permission before showing setting for face based auto-rotation
Test: locally with crosshatch & make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotateControllerTest"

Bug: 172857585
Change-Id: I825b0c2471c71a3de59532b39a47c5442f234fb5
2021-02-18 00:18:47 +00:00
Abel Tesfaye
a96775c58b Implemented new preference setting screen for face based auto-rotation
Test: locally with phone and make -j64 RunSettingsRoboTests
ROBOTEST_FILTER="com.android.settings.display.SmartAutoRotatePreferenceControllerTest"

Bug: 172857585
Change-Id: I8aaeb9d726ff71f64fd241c01fe2a1268fff927e
2021-02-08 18:21:03 +00:00
Yi-Ling Chuang
1b0823b89f Merge "Fix robotests fail if turning on silky home by default" into sc-dev 2021-02-03 01:14:24 +00:00
Yi Jiang
e47e8ec5dd Merge "Makes screen attention unsearchable on the devices that don't have the feature" into sc-dev 2021-02-02 22:29:54 +00:00
Yi Jiang
77647ea977 Makes screen attention unsearchable on the devices that don't have the feature
Bug: 178866004
Test: make RunSettingsRoboTests
Change-Id: I8881f6b87be73b2ff75e7dfe294d2dbb75ff73d4
2021-02-02 11:55:10 -08:00
Yanting Yang
6778fe74bd Fix robotests fail if turning on silky home by default
Bug: 179136903
Test: robotests
Change-Id: Ic620a5061fe7b778076970fd01f212a7aa95bf9e
2021-02-03 03:36:08 +08:00
Stanley Wang
10b7a7d483 Use MainSwitchPreference to replace the button style switches.
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Tsung-Mao Fang
010ab29eb1 Night display setting should be toggleable
Based on Android S design, we want to let user can toggle
night light in display settings page directly.

1. Use primary switch preference in xml file.
2. Add a switch toggle controler for its preference.
3. Move logic of night display preference to controler.
4. Remove the night display preference since we migrate the logic to
controller.

Test: Night display works as intented behavior.
Bug: 174964139
Change-Id: Id920033cb22b1a9dd42c77c6fc2563ddae96bfcd
2021-01-05 17:55:37 +08:00
Yanting Yang
3932b07365 Move Styles & wallpapers to the homepage group
- Add Styles & wallpapers to the homepage group.
- Create a new display settings xml for the silky home.
- Remove Styles & wallpapers from new display settings xml.
- Apply the RestrictedTopLevelPreference to remove the restricted icon.

Bug: 168166015
Bug: 174964139
Test: robotest & visual with turning on/off silky home
Change-Id: Ib495b39bc62413242247f7e767c0e44bacc6e937
2020-12-25 09:04:12 +00:00
Yi Jiang
1a5e735773 Removes TimeoutPreferenceController in Settings.
Test: unit tests
Bug: 173450342
Change-Id: I16470192fc41afe83cf601baa79fea360e8dc1d1
2020-12-16 21:30:59 +00:00
Yi Jiang
aed7559a59 Adds 'options disabled by admin' icon in timeout settings.
Bug:171257091
Test: atest ScreenTimeoutSettingsTest

Change-Id: Id0411b009a2d4dc0e4f6abf2825580ca42ad8442
2020-12-14 00:31:51 -08:00
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