Matías Hernández
f496cf6fb9
Fix NPE on modes page when schedule has no days
...
Fixes: 387088843
Test: atest ZenModeTriggerUpdatePreferenceControllerTest
Flag: EXEMPT trivial bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5098df9b6c2a7caff5dde39911c70e35f2aacbe7 )
Merged-In: I3b845784f5923521d7f3f6cae9d6d27a21f55361
Change-Id: I3b845784f5923521d7f3f6cae9d6d27a21f55361
2025-01-10 10:37:55 -08:00
Android Build Coastguard Worker
954635a223
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31162558'] into 25Q1-release.
...
Change-Id: I31785a2978327b7f62e58c9e2e4e6ba089cd1fea
2025-01-07 17:34:37 -08:00
tomhsu
10970ad6be
NTN connected type is manual, UI status shall be checked by callback.
...
- Manual type shall check with onCarrierRoamingNtnAvailableServicesChanged
- Automatic type check shall check with getAttachRestrictionReasonsForCarrier
Flag: EXEMPT bug fix
Fix: b/387523217
Test: Manual test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88a0a7610cf1a68a1215a5a89c971c65200d421b )
Merged-In: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
Change-Id: Id28885a0972a7f7d6c43ae22149b6e3e49d7f374
2025-01-07 17:30:35 -08:00
Android Build Coastguard Worker
0aac772f54
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31027098'] into 25Q1-release.
...
Change-Id: I34ae6565bb0c60e8f40a09cade9e88f48191ddf0
2024-12-26 19:07:45 -08:00
Shawn Lin
a3a7922dce
Revert "[Biometric Onboarding & Edu] Update Set up Fingerprint/F..."
...
Revert submission 30754151-boe_fp_unlock
Reason for revert: prevent from leakage
Reverted changes: /q/submissionid:30754151-boe_fp_unlock
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b75b3a373f359bd9e5d82d81d42f143926c423fd )
Merged-In: Ida3d127cc8cd71366c4375e90d6058e510f590c9
Change-Id: Ida3d127cc8cd71366c4375e90d6058e510f590c9
2024-12-26 19:03:57 -08:00
Android Build Coastguard Worker
f4385955c0
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30815274', 'googleplex-android-review.googlesource.com/30824238'] into 25Q1-release.
...
Change-Id: Ib15a082911748c50d9ce0269e1d41cd75319b4b8
2024-12-10 19:50:06 +00:00
Daniel Chapin
c8e84e540f
Revert "Migrate materialColor* attributes into colors"
...
Revert submission 29910036-color-rewrite
Reason for revert: DF Blocking bug:b/383230490 . Reverts will be cherry picked for a .003 release build.
Reverted changes: /q/submissionid:29910036-color-rewrite
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ed8074008f149acf8e1d472866803ff74c7a5d20 )
Merged-In: I1229283119cbebb6f6e837b7bbd65480299086c4
Change-Id: I1229283119cbebb6f6e837b7bbd65480299086c4
2024-12-10 19:49:08 +00:00
Jacky Wang
0dc6180a27
[Catalyst] Fix enable state for Wi-Fi hotspot
...
NO_IFTTT=Catalyst only
Bug: 383232049
Flag: com.android.settings.flags.catalyst_tether_settings
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d595b169d61b1d0fac08165b822aeedd0d4e3ee )
Merged-In: I067e97820a19822eaad2e93e30d42f7f767bf855
Change-Id: I067e97820a19822eaad2e93e30d42f7f767bf855
2024-12-10 19:48:57 +00:00
Android Build Coastguard Worker
d458d4a6dc
Snap for 12770256 from 97072e434d
to 25Q1-release
...
Change-Id: I5184d43061e5be0a619ada5d3973b5014f98912d
2024-12-10 00:46:49 +00:00
Shawn Lin
97072e434d
Merge "[Biometric Onboarding & Edu] Update Set up Fingerprint/Face Unlock page" into main
2024-12-09 10:37:03 +00:00
Marcelo Arteiro
bedda9d1f2
Merge "Migrate materialColor* attributes into colors" into main
2024-12-09 08:36:04 +00:00
Treehugger Robot
759c5644d1
Merge "[Expressive design] Migrate WifiPrivacyPage." into main
2024-12-09 07:55:43 +00:00
Shawn Lin
087ac777a8
[Biometric Onboarding & Edu] Update Set up Fingerprint/Face Unlock page
...
Update icons, strings and layouts for new UX design
Bug: 370940762
Test: manual:
Pre condition - no fingerprint/face enrolled
For FP: Go Settings>Security & privacy>Device unlock>Fingerprint unlock
For Face: Go Settings>Security & privacy>Device unlock>Face unlock
Test: atest FaceEnrollIntroductionTest
Flag: com.android.settings.flags.biometrics_onboarding_education
Change-Id: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
2024-12-09 07:52:08 +00:00
Treehugger Robot
6123cb9aeb
Merge "[Catalyst] Refactor some Text Reading items" into main
2024-12-09 07:07:59 +00:00
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
Sunny Shao
a02483adc9
[Catalyst] Refactor some Text Reading items
...
Test: atest TextReadingPreferenceFragment
Bug: 372776688
Flag: com.android.settings.flags.catalyst_text_reading_screen
Change-Id: I49aa91ca6f441814d6aaeb86826291a155a306f1
2024-12-09 12:55:30 +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
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
Android Build Coastguard Worker
f0955b6b26
Snap for 12765415 from 6c0260c0ec
to 25Q1-release
...
Change-Id: Ia2d341cf854f697972a42750620a6cc18b7648eb
2024-12-07 23:19:14 +00: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
Android Build Coastguard Worker
4a03172f87
Snap for 12763142 from d41b7cb350
to 25Q1-release
...
Change-Id: Ib41e9ec2c3662e5d1892ec79c9934c7625218c38
2024-12-07 02:18:38 +00:00
Chris Antol
d41b7cb350
Merge "Revert^2 "Integrate Settings with Preference Service"" into main
2024-12-06 21:37:39 +00:00
Bill Yi
42ca1c6a0d
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-12-06 21:09:54 +00:00
Bill Yi
e7205b4342
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-12-06 21:09:54 +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
Marcelo Arteiro
8577c10535
Migrate materialColor* attributes into colors
...
The new color were already introduces in a previous CL ag/30322786
This CL is about replacing the attribute usage by the new color resources, which should work the same but cannot be overwritten, or styled, guaranteeing consistency across the OS.
The old attributes will be removed in CL: ag/29910036
Bug: 374273611
Test: presubmit
Flag: EXEMPT Un-flaggable refactor of private color resources
Change-Id: I05b5261054bcb6de40e4e40d633025495f3dd01f
2024-12-06 16:55:33 +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
Azhara Assanova
2b09990af4
Merge "[AAPM] Tests for ActionDisabledByAdminDialog and ExternalSources page" into main
2024-12-06 15:51:23 +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
Azhara Assanova
a6ec9026e6
[AAPM] Tests for ActionDisabledByAdminDialog and ExternalSources page
...
Bug: 358229113
Bug: 369361373
Test: atest ActionDisabledByAdminDialogTest
Test: atest ExternalSourcesDetailsTest
Flag: TEST_ONLY
Change-Id: I11f0f32be4fceeccb092eca49f37227c80bef033
2024-12-06 13:46:48 +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