Commit Graph

55660 Commits

Author SHA1 Message Date
Fan Wu
224988e2e8 Merge "Disable Reset app preference during the call. Similar with ag/27511802, this is for non-SPA environment" into main 2024-12-09 06:32:45 +00:00
Jacky Wang
2e3fc47765 Merge changes from topic "catalyst" into main
* changes:
  [Catalyst] Refine WifiHotspotSwitchPreference
  [Catalyst] Refine DataSaverMainSwitchPreference
2024-12-09 06:26:53 +00:00
Fan Wu
c6544f991f Disable Reset app preference during the call. Similar with ag/27511802, this is for non-SPA environment
Bug: 342627537
Test: manual
Flag: EXEMPT Bug fix
Change-Id: If64b6c878b2f793c6852d000d9d90dda18ef2420
2024-12-09 06:18:23 +00:00
Treehugger Robot
6346a9538f Merge "[Expressive design] Remove extra background of MainSwitchPreference." into main 2024-12-09 05:16:57 +00: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
Jacky Wang
d989dc5c36 [Catalyst] Refine WifiHotspotSwitchPreference
NO_IFTTT=Catalyst only

Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Test: devtool
Change-Id: Ica09fe05cc4d30e1f55b4bd91996425ef951abf7
2024-12-09 12:44:59 +08:00
Jacky Wang
387753c005 [Catalyst] Refine DataSaverMainSwitchPreference
Export datastore for preference state monitoring.

Bug: 368359883
Flag: com.android.settings.flags.catalyst
Test: devtool
Change-Id: Ie6b001cdd6a8d27f9cb16d563852ad88b7366916
2024-12-09 12:44:55 +08: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
Treehugger Robot
cdca93976a Merge "Fix incorrect switch status when user stay in NightDisplaySettings page while scheduled night lights on" into main 2024-12-09 03:48:13 +00:00
Jacky Wang
7ca56d493a [Catalyst] Avoid creating new KeyValueStore for AirplaneModePreference
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: atest
Change-Id: I1cffcc68358f36d36e14cde5997907816ebe08a4
2024-12-09 07:31:51 +08:00
Jacky Wang
dc1a52a2ee [Catalyst] Simplify KeyValueStore API calls
NO_IFTTT=Catalyst only

Bug: 325144964
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: I518b9c861eac6d515dfc7f0ac2d028f9395e06a1
2024-12-08 19:22:18 +08:00
Treehugger Robot
6c0260c0ec Merge "Fix the unclickable learn more link." into main 2024-12-07 03:39:05 +00:00
Treehugger Robot
ce86140b85 Merge "[Catalyst] Migrate Wi-Fi Hotspot preference" into main 2024-12-07 03:01:30 +00:00
Chris Antol
d41b7cb350 Merge "Revert^2 "Integrate Settings with Preference Service"" into main 2024-12-06 21:37:39 +00:00
Riley Jones
dec6b37fe4 Merge "Cleanup deprecated functions in AccessibilityUtil" into main 2024-12-06 18:25:34 +00:00
Chris Antol
7935068c0e Revert^2 "Integrate Settings with Preference Service"
This reverts commit b2986f77a4.

Reason for revert: Re-introduce change, fixing bad test

Change-Id: Ie4e19b4691b335bab69364d12afb832e8c9b0ce1
2024-12-06 17:20:48 +00:00
Treehugger Robot
50a43ea47a Merge "Improve satellite category visiblity logic." into main 2024-12-06 16:43:13 +00:00
Treehugger Robot
a543a5791b Merge "[Catalyst] Make AirplaneModePreference final" into main 2024-12-06 16:18:54 +00:00
Chaitanya Cheemala (xWF)
360220c2bd Merge "Revert "Integrate Settings with Preference Service"" into main 2024-12-06 14:49:47 +00:00
tomhsu
ef835bb57d Improve satellite category visiblity logic.
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: manual test
Change-Id: If5df345a631006e7efc41471b6cd6419ca4b3d79
2024-12-06 14:47:47 +00:00
Jacky Wang
858fbdb759 [Catalyst] Make AirplaneModePreference final
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: TEST_ONLY
Test: atest
Change-Id: Ieea0e0e770d93d8bbe6f1f7a608541d5ba42c9cc
2024-12-06 22:20:37 +08:00
Treehugger Robot
c6636f9a25 Merge "Add a method to get controllers with same parent class type." into main 2024-12-06 13:58:49 +00:00
Chaitanya Cheemala (xWF)
b2986f77a4 Revert "Integrate Settings with Preference Service"
This reverts commit 9edbc798bf.

Reason for revert: Likely culprit for b/382590599  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ib41c13e8ba2e0eaa1ec31486ccf1f61f55793e95
2024-12-06 13:41:46 +00:00
Yiling Chuang
572afa59e6 Fix the unclickable learn more link.
The UsageProgressBarPreference is replaced with BatteryHeaderTextPreference, and the movement method of the textview was not added, which leads to the unclickable link.

Hence, add back the movement method of the textview to allow the linkable text.

Fixes: 382395040
Test: manual test
Flag: EXEMPT bugfix
Change-Id: I6dd5b2c2fbec891035fa8b0fefa47de6962324b7
2024-12-06 13:09:45 +00:00
tomhsu
63469da6f6 Remove Satellite SOS entry from AOSP
Flag: com.android.settings.flags.satellite_oem_settings_ux_migration
Bug: b/378408877
Test: make pass
Test: Manual test
Change-Id: If47081be0ed0734be841b2fe9129d22a76ed8e1b
2024-12-06 11:57:15 +00:00
Treehugger Robot
3859a8adaa Merge "[Catalyst] Migrate BluetoothTetherSwitchPreference." into main 2024-12-06 11:10:52 +00:00
Weng Su
6fb75678e5 [Catalyst] Migrate Wi-Fi Hotspot preference
Bug: 368359963
Flag: com.android.settings.flags.catalyst_tether_settings
Test: Manual testing
atest -c TetherSettingsTest \
         TetherScreenTest

Change-Id: I89d418454af7887a4892c616f4efff481b536a91
2024-12-06 10:47:37 +00:00
tomhsu
253cb874d8 Add a method to get controllers with same parent class type.
Flag: EXEMPT bug fix
Fix: b/382635197
Test: Manual test.
Change-Id: I0a48628d032d7ce1f47cbca20e63b20149b5daa0
2024-12-06 10:37:34 +00:00
Yuchen
9f10978d0c [Catalyst] Migrate BluetoothTetherSwitchPreference.
Bug: 368355361
Flag: com.android.settings.flags.catalyst_tether_settings
Test: atest TetherSettingsTest; manual
Change-Id: Ib3859d950b2d12c2fbb54dee85b20cdf2518f6b6
2024-12-06 09:32:43 +00:00
Yuchen
2b504a2762 [Expressive design] Remove extra background of MainSwitchPreference.
Bug: 349681531
Flag: EXEMPT bug fix
Test: Visual
Change-Id: Ib3a0e81b0bd1efbe85ce3992d343ae312e610dd3
2024-12-06 05:36:29 +00:00
Treehugger Robot
aa2379967c Merge "Remove replicated page of Satellite SOS." into main 2024-12-06 05:06:04 +00:00
tomhsu
c2d25241a1 Remove replicated page of Satellite SOS.
Flag: EXEMPT bug fix.
Bug: b/370509415
Test: make pass
Change-Id: Iff96dd09f8c0876a32064853629f64b0db173099
2024-12-06 03:06:52 +00:00
Chelsea Hao
fbb07d3520 Merge "Part 1 of use bluetooth toggle catalyst migration." into main 2024-12-06 03:03:49 +00:00
Chris Antol
cd8dcec82d Merge "Integrate Settings with Preference Service" into main 2024-12-06 02:22:11 +00:00
Riley Jones
6107fd8591 Cleanup deprecated functions in AccessibilityUtil
Flag: EXEMPT code cleanup
Bug: 367414968
Test: atest com.android.settings.accessibility
Change-Id: If69a964720fc91ce0ad3661f956c4818f4f2f9dd
2024-12-05 23:45:33 +00:00
Chris Antol
9edbc798bf Integrate Settings with Preference Service
Bug: 379750656
Flag: com.android.settingslib.flags.settings_catalyst
Test: unit tests
Change-Id: I6584e61bcdaa370ed879686fa5abc3f9e1c039e4
2024-12-05 16:48:34 +00:00
Treehugger Robot
cfd023dc1f Merge "[Catalyst] Migrate Airplane Mode preference" into main 2024-12-05 10:47:21 +00:00
Haijie Hong
e0c0476432 Merge "Post hiding loading view operation into to the message queue" into main 2024-12-05 10:46:34 +00:00
Weng Su
efbe144a9a [Catalyst] Migrate Airplane Mode preference
NO_IFTTT=Catalyst only

Bug: 375925972
Flag: com.android.settings.flags.catalyst_network_provider_and_internet_screen
Test: Manual testing
atest -c AirplaneModePreferenceTest \
         NetworkDashboardFragmentTest
atest -c NetworkDashboardScreenTest

Change-Id: Ie63f2208a64cadf5faaa274fd4e069d839da850e
2024-12-05 09:10:54 +00:00
Haijie Hong
b93828930e Post hiding loading view operation into to the message queue
BUG: 382407178
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I23acb528b3801b167d5bd7335b4c324ba38bdada
2024-12-05 16:40:46 +08:00
chelseahao
a7d6d46246 Part 1 of use bluetooth toggle catalyst migration.
Test: atest
Bug: 372774767
Flag: com.android.settings.flags.catalyst
Test: atest
Change-Id: Ic4be881ead92c6d56412ea3210bc5890e7f1695b
2024-12-05 15:52:25 +08:00
Yining Liu
84571f53f9 Merge changes from topic "lockscreen-notif-settings-page" into main
* changes:
  Replace the existing notifications on lock screen preferences with new page
  Implement the preference switch for minimalism on ls settings page
  Implement the Hide seen notifications toggle
  Implement the hide silent notifications toggle
  Implement the show sensitive content toggle
  Implement the main switch of notifications on lock screen
  Add the new settings page for lock screen notifs
2024-12-05 05:49:31 +00:00
YK Hung
ecf9da2554 Merge "[ExpressiveBattery] Replace LayoutPreference with IntroPreference." into main 2024-12-05 03:36:41 +00:00
Yining Liu
85aa7f7c86 Replace the existing notifications on lock screen preferences with new page
Replace the existing notifications on lock screen preferences with the new
notifications on lock screen page entries.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: Manual, Settings - Display & touch - Lockscreen; Settings - Security &
privacy - More security & privacy

Change-Id: I858f84db8b5c09895d6b196426b32b3bfbd80d15
2024-12-04 22:08:25 +00:00
Yining Liu
81d390968b Implement the preference switch for minimalism on ls settings page
Implement the preference switch for notification minimalism on the
notifications on lock screen settings page. The illustrations and
summaries will also update when switching the preference. This
preference will hide when the main toggle is unset or when the lock
screen notification minimalism feature flag is disabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_notification_minimalism <1|0>
Change-Id: Ie6596e518bd1aa2e828587d7d174b57256aec45b
2024-12-04 22:08:25 +00:00
Yining Liu
bd6561accf Implement the Hide seen notifications toggle
Implement the Hide seen notifications toggle on the notifications on
lock screen page. The toggle will become invisible
when the main toggle is unset or when the lock screen notification
minimalism feature flag is disabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_show_notifications <1|0>
Change-Id: I6f94be3295dfbaa978d145d113e03cacc1a232fc
2024-12-04 22:08:24 +00:00
Yining Liu
4c507b1132 Implement the hide silent notifications toggle
Implement the hide silent notifications toggle on the notifications
on lock screen page. This toggle will become invisible when the main
toggle is unset. This toogle will replace the existing Notifications
- notifications on the lock screen - hide silent conversations and
notifications preference when the flag is enabled.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings put secure \
 lock_screen_show_silent_notifications <1|0>
Change-Id: Icc0b26afd199ec3f14237fd1cdb27981383ae69f
2024-12-04 22:03:12 +00:00
Daniel Norman
908bd398bd Adds null checks on callers of Nullable method getA11yServiceInfo().
Also renames mPackageName to mFeatureName. This string is used as the
user-visible feature name, e.g. TalkBack, not the APK package name.

Fix: 382054546
Test: n/a (existing presubmit)
Flag: EXEMPT minor bugfix
Change-Id: I1ce6902612d89bbb68bddf30227ca231ea98dce7
2024-12-04 19:41:07 +00:00
Yining Liu
c16c9b2df6 Implement the show sensitive content toggle
Implement the show sensitive content only when unlocked toggle on the
notifications on lock screen page. The toggle will become invisible
when the main toggle is unset or when there's no screen locks.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: adb shell settings get secure \
 lock_screen_allow_private_notifications <1|0>
Change-Id: I174478540c4cc2e2df7047049671266041dd41cf
2024-12-04 18:53:35 +00:00
Yining Liu
0d75a26a68 Implement the main switch of notifications on lock screen
Add the ability of controlling whether to show notifs on the lock
screen (secure setting: lock_screen_show_notifications) to the new
lock screen notification settings page main switch. This switch also
listens to the change of lock_screen_show_notifications to update
its status in case of other places change the value.

Bug: 367455695
Flag: com.android.server.notification.notification_lock_screen_settings
Test: atest LockScreenNotificationsPreferenceControllerTest
Change-Id: Id598d508ac383563a0d9413578251eb22ed4ca90
2024-12-04 18:53:32 +00:00