Commit Graph

18788 Commits

Author SHA1 Message Date
Xin Li
10d930d1cf Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future
Bug: 385190204
Merged-In: I04f90b42907d07c6111a7b41a531f7717df33672
Change-Id: I58e92a6e45193de820f7432dcb365c41c14d3141
2025-03-06 12:22:41 -08:00
Xin Li
911fdcebcf Merge "Merge 25Q1 (ab/12770256) to aosp-main-future" into aosp-main-future 2025-02-27 15:24:25 -08:00
Kevin Liu
4d38f48c68 Merge "Revert "Temp disable test that contains custom shadow within it"" into main 2025-02-27 07:29:29 -08:00
Xin Li
5bfde9fbf5 Merge 25Q1 (ab/12770256) to aosp-main-future
Bug: 385190204
Merged-In: Iaee6792d1a27be8fa4b443f783a47a3715b6d3a1
Change-Id: I0ac29cecfec526a38cf4a120b8ef704ee7bc01b3
2025-02-26 11:59:26 -08:00
Kevin Liu
78e05bbcec Revert "Temp disable test that contains custom shadow within it"
This reverts commit a9e22be8a5.

Reason for revert: No longer need to ignore this test, as the root cause is found and fixed in aosp/3506812

Change-Id: I56681bde8c0485c46f0cd2b84cb83fee5ea0e760
2025-02-26 11:04:50 -08:00
Treehugger Robot
a9d0f2b261 Merge "Change range of battery saver schedule seekbar" into main 2025-02-20 03:22:43 -08:00
Henrik Baard
37bf0fbe57 Change range of battery saver schedule seekbar
The minimum value which can be set as trigger for
Battery saver was changed from 10% -> 20% however the
settings UI was not aligned with this change.

ref: b0fe225 Update the battery saver scheduler minimum level

Update the UI to align with the minimum trigger
level.

Bug: 396444535
Test: manual, check minimum seekbar value after reboot.
Test: atest BatterySaverScheduleSeekBarControllerTest
Change-Id: I4baa766ff1cb78ce656ae340ce930094b9e124e0
2025-02-20 09:13:39 +01:00
utzcoz
799e0e877a test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest
Rule should be public for junit.

Test: atest SettingsRoboTests:com.android.settings.applications.AppWithAdminGrantedPermissionsCounterTest

Merged-In: Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88

Change-Id: I2f577f71011e1197703e115b704af0aa1ee1e5dd
Signed-off-by: utzcoz <utzcoz@gmail.com>
2025-02-18 00:51:24 -08:00
Kevin Liu
a9e22be8a5 Temp disable test that contains custom shadow within it
We need proper support or Exception throw for this scenario

Test: atest SettingsRoboTests
Bug: 394813533
Change-Id: I8b552f7b2bff166643bdaa492dceff23679116ff
2025-02-06 14:48:43 +00:00
Jakub Rotkiewicz
1dda4f5526 24Q4: Removal of a2dp_offload_codec_extensibility_settings
Bug: 323319530
Fix: 323319530
Flag: EXEMPT removing com.android.settings.development.a2dp_offload_codec_extensibility_settings
Test: atest SettingsRoboTests
Merged-In: If9c710c0aaed7326b32dd2e7d5f3109de4047b97
Change-Id: I3fad2d0b5b356afd3524ef9ddc0cf1ccbaed9eb4
2025-01-15 07:52:37 +00:00
Jakub Rotkiewicz
672fcd51ab developer settings: remove unused a2dp Preference
Bug: 329809288
Flag: EXEMPT - unused code
Test: m -j
Merged-In: Ibd526fffddf5ea545afc437a5daee12bb1cf8746
Change-Id: Ie219247e1fd0fd92407c04d5d775a685a13467c4
2025-01-15 07:49:22 +00:00
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
Rex Hoffman
3d508d0d12 Removing upstream flag as it is now the default.
Also moving to internal robolectric projects to no longer use the  _upstream suffix.

Test: CI
Bug: 386652866
Change-Id: Ic4376619f01834a97ec10c33c283fd7cab45900f
2025-01-08 21:05:34 +00:00
Rex Hoffman
ccf197b366 Merge "Removing Dead Flag Test: CI Bug: 386652866" into main 2025-01-08 12:17:27 -08:00
Rex Hoffman
f4290c1d03 Removing Dead Flag
Test: CI
Bug: 386652866

Change-Id: Ib8a48063738f6362342957b39451a7c352a9a9d5
2025-01-07 14:01:21 -08:00
Treehugger Robot
c8e78dc149 Merge "Hide Linux terminal if VM isn't supported" into main 2024-12-28 07:11:08 -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
Qiang Chen
7abc384e33 Show GSM settings with CDMA phone type
Phone type may be changed to CDMA if no SIM is in this sub and will not
show GSM settings in current design, so remove sub info check for
showing GSM settings.
Show GSM settings if the current radio can support both 3GPP and 3GPP2
radio technologies at the same time.

Bug: 278178437
Test: Manaul

Change-Id: I4f8cbfcdcff8f74944e2ba9a79b0945be6dd6ebd
2024-12-22 17:46:53 +05:30
Jaewan Kim
614074e5c7 Hide Linux terminal if VM isn't supported
Bug: 385216798
Test: atest
Flag: Build.RELEASE_AVF_SUPPORT_CUSTOM_VM_WITH_PARAVIRTUALIZED_DEVICES
Change-Id: I06fe52cf877deb3cd9ebc61af1579931b97d7766
2024-12-21 00:31:55 +09: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
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
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
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
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
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
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
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
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
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
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
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
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
Matthew DeVore
7403db7745 Merge changes Icd3e0c93,I8932e80c into main
* changes:
  TopologyScale: limit vertical padding
  TopologyScale values for scaling the topology pane
2024-12-04 17:59:21 +00:00
Treehugger Robot
98f593c569 Merge "Customize the availability of Testing Settings Menu" into main am: d25fdc50d8 am: b6683ea552
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2927822

Change-Id: I64e8986fc4ae55290851b6f084bed6848626eb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 12:27:35 +00:00
Treehugger Robot
b6683ea552 Merge "Customize the availability of Testing Settings Menu" into main am: d25fdc50d8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2927822

Change-Id: I3d6a579d6a5b999b783610e1a2b80031aa1b1ec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-12-04 11:51:51 +00:00
David Magno
8839335d58 Customize the availability of Testing Settings Menu
Add the possibility to disable the Testing Settings Menu
(secret code *#*#4636#*#*) on user builds.

Bug: 306338055
Test: atest TestingSettingsBroadcastReceiverTest
Flag: NA
No-Typo-Check: trivial
Change-Id: I451f094864bd9a0ad8086e9646e2d666ab2388dc
2024-12-04 11:23:25 +00:00
mxyyiyi
7ce71c7619 [ExpressiveBattery] Replace LayoutPreference with IntroPreference.
Use IntroPreference to show apps' icon and label in
(1) App info > App battery usage page
(2)App info > App battery usage > Allow background usage

Bug: 349652542
Test: visual
Flag: EXEMPT flag by System prop
Change-Id: I44f3369e48f073d98455fcab3ccd10ffecdb8d66
2024-12-04 17:38:42 +08:00
SongFerng Wang
2950121243 Merge "Skip the notification when the userId is not main" into main 2024-12-04 07:06:55 +00:00