Commit Graph

786 Commits

Author SHA1 Message Date
Chris Antol
5015b5c549 Update permission for accessing Brightness Level
Bug: 388372939
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: atest PreferenceServiceTest
NO_IFTTT=Not applicable to preference controller

Change-Id: I7126ca56eb19fd113ad64eed1417651758711f3f
2025-01-27 13:30:24 -08:00
Treehugger Robot
d49287f08e Merge "fix(brightness suw): Hide brightness preference in the suw." into main 2025-01-21 00:03:42 -08:00
Menghan Li
47550d4c8a fix(brightness suw): Hide brightness preference in the suw.
Root cause: there's a mismatch in how visibility is determined for
the AutoBrightnessPreferenceControllerForSetupWizard. The
getAvailabilityStatus method and the displayPreference method
(specifically the preference.setVisible call) use different
conditions for showing the preference.
Solution: To ensure consistency, I propose aligning these conditions
by incorporating an aconfig flag check in both places. This will
prevent unexpected behavior and make the logic clearer.

Bug: 389011125
Flag: com.android.settings.accessibility.add_brightness_settings_in_suw
Test: atest AutoBrightnessPreferenceControllerForSetupWizardTest
            BrightnessLevelPreferenceControllerForSetupWizardTest
Change-Id: I004bfe8b1e039734356715c971f0bfbe56ffa9db
2025-01-21 05:25:21 +00:00
Jacky Wang
041bc113eb Remove MainSwitchPreference.updateStatus
NO_IFTTT=Update API

Bug: 391092187
Flag: EXEMPT library
Test: atest&manual
Change-Id: I6e31857d8ca7084c737fd69f63b33f6a58cf3022
2025-01-21 07:44:43 +08:00
Treehugger Robot
12a64f350e Merge "[Catalyst] Update RangeValue usages to IntRangeValuePreference" into main 2025-01-19 21:36:17 -08:00
Fan Wu
8d318b21d8 [Catalyst] Update RangeValue usages to IntRangeValuePreference
Bug: 388167302

Test: atest and manual

Flag: EXEMPT refactor

NO_IFTTT=refactor

Change-Id: If7412da90a5b5c1b4e3c31ea36361eae9e8bb8b9
2025-01-20 03:23:57 +00:00
Treehugger Robot
07eca37281 Merge "[Catalyst] Rollback the Adaptive brightness key" into main 2025-01-17 06:31:32 -08:00
Sunny Shao
03de6af4fc [Catalyst] Rollback the Adaptive brightness key
Let the redirect highlight function work from Turbo app.

NO_IFTTT=Catalyst migration

Test: devtool, atest AutoBrightnessScreenTest
Bug: 390525596
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Id7261d8a51368c45b7e23fee911565a226b30779
2025-01-17 08:27:02 +00:00
Jacky Wang
68178f684e [Catalyst] Refine AmbientDisplayAlwaysOnPreference datastore
NO_IFTTT=Catalyst only

Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: devtool
Change-Id: Icd7990d4bb42c2ed5e3432d0dd81473217913b56
2025-01-17 16:05:42 +08:00
Fan Wu
297941ba2f [Catalyst] Remove PreferenceMetadata usages
Classes that implement PersistentPreference don't need to implement PreferenceMetadata

Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor

Change-Id: Icf7d5eb4bbd426eb7e8dd562eda3c0a775457a3e
2025-01-16 17:46:28 -08:00
Jacky Wang
5a747c5a14 [Catalyst] Leverage PrimarySwitchPreferenceBinding
NO_IFTTT=Catalyst only

Bug: 335132588
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: I3a566d98500bd09526c1f8d34fb7c47e9dff68b7
2025-01-16 17:13:20 +08:00
Fan Wu
9782d86786 [Catalyst] Rename BooleanPreference to BooleanValuePreference
Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor

Change-Id: Id447d0729b9202df96b610c3991f9d03dda8c811
2025-01-15 22:34:35 -08:00
Fan Wu
d0d793da2e [Catalyst] Remove BooleanValue usages
Bug: 388167302
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor

Change-Id: Ia3d14143185708e34325a641cb872d7e2675e3bc
2025-01-14 23:32:42 -08:00
Fan Wu
4ca85b1e5c [Catalyst] Update DataChangeReason usages to PreferenceChangeReason
Bug: 388677104
Test: atest and manual
Flag: EXEMPT refactor
NO_IFTTT=refactor
Change-Id: I3c1aae3dc10a1c78e1b2b0ead8ffc83da933e174
2025-01-09 20:03:09 -08:00
Jacky Wang
90ee129baf [Catalyst] Use range int type for BrightnessLevelPreference
NO_IFTTT=Catalyst only

Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: devtool
Change-Id: I1f5becd58e63183a56360b355d8bf753de81242f
2024-12-31 10:42:27 +08:00
Jacky Wang
cfcf20c70a [Catalyst] Provide screen key to @ProvidePreferenceScreen
NO_IFTTT=Catalyst only

Bug: 386179791
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: Ie8106ec45a32e4a61826512fc62746c9ffc47d9c
2024-12-27 17:14:27 +08:00
Treehugger Robot
12966f2608 Merge changes from topic "catalyst-battery" into main
* changes:
  [Catalyst] Implement get{Read,Write}Permissions for Battery percentage
  [Catalyst] Implement get{Read,Write}Permissions for Battery level
2024-12-25 01:52:05 -08:00
Treehugger Robot
6e27501831 Merge "[Catalyst] Implement get{Read,Write}Permissions for Always show time and info" into main 2024-12-25 00:55:18 -08:00
Jacky Wang
68ddca4c9a [Catalyst] Implement get{Read,Write}Permissions for Battery percentage
NO_IFTTT=Catalyst only

Fix: 385288692
Flag: com.android.settings.flags.catalyst_power_usage_summary_screen
Test: devtool
Change-Id: I42ba759cac04ffc41787b0fca3e04f64584c57c9
2024-12-25 16:38:02 +08:00
Treehugger Robot
92eac696e5 Merge "[Catalyst] Implement get{Read,Write}Permissions for Brightness level" into main 2024-12-25 00:22:46 -08:00
Treehugger Robot
44fc477d87 Merge "[Catalyst] Implement get{Read,Write}Permissions for Adaptive brightness" into main 2024-12-25 00:04:04 -08:00
Sunny Shao
249a4426b6 [Catalyst] Implement get{Read,Write}Permissions for Adaptive brightness
NO_IFTTT=Catalyst migration

Test: Devtool
Bug: 385266613
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: I32e8b5e30269397b6198bcd87d366ada73d84893
2024-12-25 14:48:57 +08:00
Sunny Shao
1f5b0e9a7c [Catalyst] Implement get{Read,Write}Permissions for Always show time and info
NO_IFTTT=Catalyst migration

Test: devtool
Bug: 385272042
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Change-Id: I67513e205113df531accd9f84480d7921144df52
2024-12-25 14:14:26 +08:00
Jacky Wang
e7fbf8f92c [Catalyst] Refactor DarkModeScreen
By virtue of KeyValueStore abstraction, the per-fragment state could be
moved into storage.

NO_IFTTT=Catalyst only

Bug: 375132235
Flag: com.android.settings.flags.catalyst_dark_ui_mode
Test: Manual
Change-Id: Ifff1c6e0b51cda981337b84008713c35a0a724ea
2024-12-25 10:39:25 +08:00
Sunny Shao
0ef3c2ca0d [Catalyst] Implement get{Read,Write}Permissions for Brightness level
NO_IFTTT=Catalyst migration

Test: Devtool
Fix: 385035021
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Idf07b75ab9776b33bcddb1ffc93eca7594524c14
2024-12-25 10:32:58 +08:00
Treehugger Robot
3b54bb45e6 Merge "[Catalyst] Implement get{Read,Write}Permissions for Dark theme" into main 2024-12-24 06:23:28 -08:00
Treehugger Robot
ba8348c6a2 Merge "[Catalyst] Implement get{Read,Write}Permissions for Screen attention" into main 2024-12-24 04:03:33 -08:00
Sunny Shao
79004d10f0 [Catalyst] Implement get{Read,Write}Permissions for Screen attention
NO_IFTTT=Catalyst migration

Test: devtool
Fix: 385274700
Flag: com.android.settings.flags.catalyst_screen_timeout
Change-Id: I77c4584fa92713854520594a1bdb9448937d14fb
2024-12-24 00:59:20 -08:00
Sunny Shao
69b90da388 [Catalyst] Implement get{Read,Write}Permissions for Smooth display
NO_IFTTT=Catalyst migration

Test: Devtool
Fix: 385267421
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: I475ba6dc0cf44802c293deeda98ea8ca12d4df9e
2024-12-23 15:48:50 +08:00
Sunny Shao
34ff37e91c [Catalyst] Implement get{Read,Write}Permissions for Dark theme
NO_IFTTT=Catalyst migration

Test: Devtool
Fix: 385271120
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: I09cae1d99d149cc7c481080388c6d44088e857c2
2024-12-23 15:36:52 +08:00
Rupesh Bansal
99b6ebb402 Merge "Changing eventFlags to eventFilter" into main 2024-12-20 21:25:48 -08:00
Treehugger Robot
0abc339959 Merge "[Catalyst] Update brightness preference to FloatPersistentPreference" into main 2024-12-18 17:05:42 -08:00
Roy Chou
b694a0afc9 Merge "feat(brightness suw): hide brightness preferences if restricted" into main 2024-12-18 00:21:45 -08:00
Jacky Wang
45b0bfe612 [Catalyst] Update brightness preference to FloatPersistentPreference
NO_IFTTT=Catalyst only

Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Test: N/A
Change-Id: I230d30add8f6524db8548de14d9d227c167e0ef4
2024-12-18 15:47:07 +08:00
Roy Chou
79632a9fc5 feat(brightness suw): hide brightness preferences if restricted
By default if a RestrictedPreference is restricted then the preference
becomes disabled but still visible. But for brightness preferences in
A11y SUW we'd like to hide them if they're restricted and disabled,
since it's meaningless to show disabled items in SUW.

To achieve this, in PreferenceController#displayPreference we check the
whether the preference is RestrictedPreference and restricted, so we can
decide whether to hide it. Besides, if the preference is restricted and
we hide it, in PreferenceController#getAvailableStatis we also return
CONDITIONALLY_UNAVAILABLE to make consistency.

Bug: 384620216
Flag: com.android.settings.accessibility.add_brightness_settings_in_suw
Test: manually
      atest AutoBrightnessPreferenceControllerForSetupWizardTest
      atest BrightnessLevelPreferenceControllerForSetupWizardTest
Change-Id: Ifb68b4d64fc111d91a23457882a006002173d232
2024-12-18 07:05:45 +00:00
Rupesh Bansal
74f0acd92b Changing eventFlags to eventFilter
This is to address the API council feedback

Bug: 379313664
Flag: EXEMPT minor change
Test: EXEMPT minor change
Change-Id: I9f9126b2e9eae3311f9d03d13d201d7518a27a09
2024-12-17 12:58:49 +00:00
Sunny Shao
9648e58eaa [Catalyst] Add the store and get API into BrightnessLevelPreference
NO_IFTTT=Catalyst migration

Test: atest DisplayScreenTest
Bug: 375895862
Flag: com.android.settings.flags.catalyst_display_settings_screen
Change-Id: Ifb4fcf6553b070959ae233ed32e806c4c13d7136
2024-12-17 16:46:02 +08:00
Jacky Wang
821d320051 [Catalyst] Update permission check API signature
NO_IFTTT=Catalyst only

Bug: 374115149
Flag: com.android.settings.flags.catalyst
Test: manual
Change-Id: Ib13a5fddd517e3e260815b753b55c008e24d70d8
2024-12-13 16:09:58 +08:00
Treehugger Robot
d4ad552cd9 Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca93976a am: ca445ed06d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238

Change-Id: I1175ad2c5dfeccf51fa8efc533d44e470ea7514a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-09 04:52:41 +00:00
Treehugger Robot
ca445ed06d Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main am: cdca93976a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2181238

Change-Id: I8c3f7ba8b5a1e237148a6532d53d2b519ef1862f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-09 04:18:48 +00:00
Jacky Wang
8a97245b3d [Catalyst] Add sensitivity level
NO_IFTTT=Catalyst only

Bug: 380457585
Flag: com.android.settings.flags.catalyst
Test: Manual
Change-Id: Ia98a925011723738e1a16cc0e0c3d703d3dbd505
2024-11-29 07:36:13 +08:00
Jacky Wang
efcb4dfddf [Catalyst] Migrate AmbientDisplayAlwaysOnPreferenceController
As the preference is exported as external settings, for safety, do not
update the preference key with datastore key. As a workaround, manage a
mapping between preference hierarchy key and datastore key.

Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: devtool
Change-Id: I56126485061859b41216cd23b8e1caf63823a1ec
2024-11-21 13:37:31 +08:00
Jacky Wang
b6132572ea [Catalyst] Migrate "Lock screen" entry point
Bug: 372307567
Flag: com.android.settings.flags.catalyst_lockscreen_from_display_settings
Test: manual
Change-Id: I0c269c550c678362f345c9b5438a133c7a76fe10
2024-11-21 10:24:38 +08:00
Jacky Wang
83708d4499 [Catalyst] Update PreferenceLifecycleContext.notifyPreferenceChange
Change the signature from metadata to preference key, so that the API
could be used to notify other preferences on the same screen.

NO_IFTTT=Catalyst only

Bug: 332201912
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: Ibdf5f9004471d5491a0be1e84365cbe9f136c373
2024-11-19 13:38:06 +08:00
Jacky Wang
eb37f169a3 Merge "[Catalyst] Support Getter API for settings service" into main 2024-11-17 05:53:58 +00:00
Jacky Wang
e635f1e0ed [Catalyst] Support Getter API for settings service
NO_IFTTT=Catalyst only

Bug: 373895596
Flag: com.android.settings.flags.catalyst_service
Test: devtool
Change-Id: I367f350d2192d1285bf355a9e45c2d9bec11fa44
2024-11-16 08:06:28 +08:00
Jacky Wang
dec8370d25 [Catalyst] Migrate "Screen attention"
Bug: 368359967
Flag: com.android.settings.flags.catalyst_screen_timeout
Test: devtool
Change-Id: I3c990e8cb6d1414395408b884616574cd6130f81
2024-11-16 03:42:57 +08:00
Jacky Wang
e6ef4c2443 [Catalyst] Add initial ScreenTimeoutScreen
Bug: 368359967
Flag: com.android.settings.flags.catalyst_screen_timeout
Test: atest
Change-Id: I13d23e4e5164c3dd4a4a01b00b854642f748b020
2024-11-16 03:42:47 +08:00
Jacky Wang
8d3be11418 Refactor duplicate isAdaptiveSleepSupported
Bug: 368359967
Flag: EXEMPT refactor
Test: atest
Change-Id: I41d465f67fb50e83d9bd23af54597afb6bd467cf
2024-11-16 01:49:52 +08:00
Fan Wu
14ba0b6571 Merge "Revert "Revert "Migrate Battery percentage preference into catal..."" into main 2024-11-14 03:24:54 +00:00