Pajace Chen
4af6ae88a4
Fix failed test case for BatteryTip in Settings
...
- Replace the deprecated mocktio rule with MockitoJUnit.rule
- Fix the failed test cases
- Update the testing convention
Bug: 323627875
Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batterytip
Change-Id: I25a39c8e7ad07482352c1e2152d8e16555429ab1
2024-02-03 17:24:42 +08:00
Pajace Chen
32587dbdcf
Merge changes from topics "low_battery_tip", "new_settings_card" into main
...
* changes:
[BatteryTip] Implement new CardPreference to apply new style
[BatteryTips] Separate the low battery tips
2024-02-03 01:45:21 +00:00
Becca Hughes
d8a82105e0
Merge "Fix settings flakiness bug" into main
2024-02-03 00:15:57 +00:00
Adam Bookatz
5eccc6327b
Merge "Settings: Profiles inherit call restrictions" into main
2024-02-02 22:47:27 +00:00
Becca Hughes
7df4f0f4bd
Fix settings flakiness bug
...
The flakiness was caused by mVisibility
being out of sync and resulting in the
preference being hidden / shown incorrectly.
Test: manual & unit tests
Bug: 322072349
Change-Id: I588da2100b8f2cea38f2bdb63af4e8d19d0efd0b
2024-02-02 22:43:30 +00:00
Aishwarya Mallampati
abf2a6ae52
Merge "Disable Wi-Fi calling roaming preferrence while using NTN." into main
2024-02-02 22:40:50 +00:00
Jacky Wang
b16781d2bc
Merge "Support "Independent system keyboard haptics settings"" into main
2024-02-02 19:23:33 +00:00
Hao Dong
cdf34b66cb
Merge "Show split screen dialog on the introduction and enrolling page." into main
2024-02-02 18:30:46 +00:00
pajacechen
d171a8b946
[BatteryTip] Implement new CardPreference to apply new style
...
- Implement a new CardPreference to apply SettingsCard
- Apply CardPreference on battery tips
Bug: 315748218
Test: atest SettingsSpaUnitTests:com.android.settings.widget.CardPreferenceTest
Test: atest SettingsRoboTest:com.android.settings.fuelgauge
Change-Id: I9a57e7739275854278b2c586793af718b0680d23
2024-02-02 22:27:16 +08:00
pajacechen
5dd8460c3e
[BatteryTips] Separate the low battery tips
...
Bug: 315748218
Test: atest SettingsRoboTestStub:com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetectorTest
Change-Id: Id973be37012da414d6125a4dd29ec4522ab80e95
2024-02-02 22:16:58 +08:00
Yiyi Shen
d8d977d442
Merge "[Audiosharing] Fix tests when flag is on." into main
2024-02-02 10:23:53 +00:00
Yiyi Shen
769f9ae45e
[Audiosharing] Fix tests when flag is on.
...
Test: atest
Bug: 305620450
Change-Id: I85e8be4aef84a550bd4fe556848f3627b0f29fa6
2024-02-02 16:05:13 +08:00
Yiyi Shen
3b0d829152
Merge "[Audiosharing] Handle fallback device for calls and alarms." into main
2024-02-02 07:36:48 +00:00
Fan Wu
63a9d21e26
Merge "Remove redundant cast" into main
2024-02-02 06:43:24 +00:00
Aishwarya Mallampati
aab23344cb
Disable Wi-Fi calling roaming preferrence while using NTN.
...
When phone is connected to non-terrestrial network, carrier can specify
whether to override Wi-Fi calling roaming mode or not using
KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL.
If KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL is false,
and if KEY_NTN_EDITABLE_WFC_ROAMING_MODE_BOOL is true and
if KEY_OVERRIDE_WFC_ROAMING_MODE_WHILE_USING_NTN_BOOL is true, then
Wi-Fi calling roaming preferrence is disabled.
Bug: 318871716
Test: atest CarrierConfigManagerTest, atest ImsManagerTest,
atest WifiCallingSettingsForSubTest
Change-Id: I95bf5e6a0f11796e67bd7e6a2c12a331481f8187
2024-02-02 06:34:18 +00:00
Yiyi Shen
e96833943a
[Audiosharing] Handle fallback device for calls and alarms.
...
Test: atest
Bug: 305620450
Change-Id: I1c7a49b6aed7d47b7fdbcc6b475b8e99edc52443
2024-02-02 13:32:50 +08:00
Joanne Chung
8541c6c4ef
Merge "Allow uninstallation of current home app" into main
2024-02-02 05:02:50 +00:00
Fan Wu
148640e72d
Remove redundant cast
...
Bug: 313569889
Test: atest
Change-Id: Idad218e3722f29063b6c357139f7120414dea09e
2024-02-02 02:35:53 +00:00
lpeter
b3e2179531
Allow uninstallation of current home app
...
Change the behavior to allow uninstallation of the current home app
if it is a non-system app and/or there are other candidate apps
available.
Bug: 131721576
Test: atest com.android.settings.applications.appinfo.AppButtonsPreferenceControllerTest
Test: atest com.android.settings.spa.app.appinfo.AppButtonRepositoryTest
Change-Id: I556966894240aaf91c0e6424dce514b6a35d1001
2024-02-01 23:57:15 +00:00
Beverly Tai
29c3b87546
Merge "Update fold setting illustrations" into main
2024-02-01 21:14:16 +00:00
Ahmad Khalil
92fb442d09
Merge "Fix notification vibration demos in settings" into main
2024-02-01 13:59:24 +00:00
Bill Yi
16462ab00f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: dc549ff191 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077666
Change-Id: If9504c382bb0f73ff3411b9ef87cae0310a41e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-01 13:53:53 +00:00
Bill Yi
d49fbdd697
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1a2a0f164 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077666
Change-Id: Ia9fd060f000f814b808e0ca93f965d16f4d64b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-01 13:53:46 +00:00
Bill Yi
798751d4cd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e99d19cd85 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077662
Change-Id: I12b56068bb6d3e126a7328eb37a64a5c7e5eec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-01 13:53:27 +00:00
Bill Yi
dc549ff191
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-01 13:20:30 +00:00
Joseph Vincent
47abd1ba60
Merge "Add Private space Delete settings page inside PS settings page" into main
2024-02-01 10:12:14 +00:00
Hao Dong
c9aaa73b51
Show split screen dialog on the introduction and enrolling page.
...
Revert ag/22361082 and ag/22460413, show the split screen dialog on
the introduction and enrolling page, instead of relying on the callers
to show the dialog.
Test: atest BiometricsSplitScreenDialogTest
Test: atest FaceEnrollIntroductionTest
Test: atest SetupFingerprintEnrollIntroductionTest
Bug: 299573056
Change-Id: Ieb106a4a623ad5ca0e6eb1633413df75767bef52
2024-02-01 08:36:04 +00:00
Adam Bookatz
84bc8a918d
Settings: Profiles inherit call restrictions
...
Currently, if Settings applies CALLS or SMS restrictions to a user, that
restriction doesn't propogate to its child profiles. It should.
This is actually a no-op right now, since it's not possible to have a
profile on a user that isn't the Admin user anyway. But one day such a
thing may be allowed, so this implementation is more future-proof and
safer.
Test: Manual verification that applying the restriction continues to
work properly a full user
Test: UserDetailsSettingsTest
Bug: 261469887
Change-Id: Ib19cecbd37b6efc90f9655565295e7856427f049
2024-01-31 16:14:38 -08:00
SongFerng Wang
5fa73d14ab
Merge "[Sim UI enhancement] remove the "Tap to show info"" into main
2024-01-31 19:53:35 +00:00
SongFerng Wang
35b3ad939c
Merge "[Sim UI enhancement] MobileNetworkSettings UI enhancement" into main
2024-01-31 19:50:39 +00:00
josephpv
e1a2c82db3
Add Private space Delete settings page inside PS settings page
...
Contains implementation of settings page for Delete private space
controller inside private space settings page.
- On selecting to delete private space displays list of account signed in
to private profile and deletes the private space after authentication.
- Shows a toast message after private space is deleted
- Adds dependency for setupdesgin loading layout to show a loading
screen while deletion of private space is in progress.
Recording Link : b/318383729
go/ss/4Aq3rmbSGHMHesK.png
Bug: 318383729
Test: atest DeletePrivateSpaceControllerTest
Change-Id: Ia1730915e2469b47823c507f9ef6cd8f63c99baf
2024-01-31 19:29:13 +00:00
Jacky Wang
2651a6ff69
Support "Independent system keyboard haptics settings"
...
Bug: 308387862
Change-Id: Iebb67a80859d08a059261a30dc64acef395f43a1
Test: manual test
2024-02-01 03:06:33 +08:00
Treehugger Robot
dfa229a1cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 72df0d20a9 -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077419
Change-Id: Iec65d1a0d79951e9040e1a26c0ae3b18a421cd3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 18:36:14 +00:00
Bill Yi
642136a043
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fecbcac5cf -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077419
Change-Id: I27bbfc71a4b1885f7bd4faea2e2e2c35fecf2f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 18:36:03 +00:00
Bill Yi
3b6b68ca4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7083fedd9b -s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26077417
Change-Id: I4d49bdd7a07d70df507a537b0ad5c3607f3c33f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 18:34:37 +00:00
Treehugger Robot
72df0d20a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2024-01-31 18:08:28 +00:00
Beverly
78d5efebdb
Update fold setting illustrations
...
Flag: ACONFIG fold_lock_setting_enabled TRUNKFOOD
Flag: ACONFIG com.android.internal.foldables.flags.fold_grace_period_enabled TRUNKFOOD
Test: manually check settings pages
Fixes: 319857292
Change-Id: If0e9b8ae9be29a65ce03b030105bf74e41ea845c
2024-01-31 16:05:43 +00:00
SongFerngWang
c6eba747db
[Sim UI enhancement] remove the "Tap to show info"
...
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: atest PhoneNumberPreferenceControllerTest
atest ImeiInfoPreferenceControllerTest
atest SimEidPreferenceControllerTest
Change-Id: Iadd82173b55b8f66409c1ff056dd4c323d6dcc35
2024-01-31 11:14:38 +00:00
Ahmad Khalil
4504f0ace4
Fix notification vibration demos in settings
...
While in zen mode, notification vibrations are ignored. These vibrations will also be ignored when attempting to demo the vibration intensity in settings.
Adding FLAG_BYPASS_INTERRUPTION_POLICY to the attributes of the vibration preview, to allow it to bypass the interruption policy and demo the vibration intensity as expected.
Fix: 301319836
Test: N/A
Change-Id: I240a896ff8e9516388a0238882db07f9680a184a
2024-01-31 10:45:55 +00:00
Bill Yi
e1a2a0f164
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If98d3ff31e422f5e52d27f3faafb57402c3a7427
2024-01-31 00:51:05 -08:00
Bill Yi
e99d19cd85
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia6925d0bfc9475932b9a441d7619bc888836583c
2024-01-31 00:47:49 -08:00
Bill Yi
fecbcac5cf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2fc11584bd33e92ae5a7b503a0c1c9466223abd5
2024-01-31 00:45:20 -08:00
Bill Yi
7083fedd9b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3a91aefaedc27c182f1150c78a5df71fa8dd0523
2024-01-31 00:43:53 -08:00
SongFerngWang
8535539582
[Sim UI enhancement] MobileNetworkSettings UI enhancement
...
- Add the phone number
- Add the mobile network(SPN)
- Add the IMEI
- Add the EID
- Remove the mobile data
- Remove the Auto data switch
- Remove the calls and SMS default subscription
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: atest MobileNetworkEidPreferenceControllerTest
atest MobileNetworkImeiPreferenceControllerTest
atest MobileNetworkPhoneNumberPreferenceControllerTest
atest MobileNetworkSpnPreferenceControllerTest
atest MobileDataPreferenceControllerTest
atest MobileNetworkSettingsTest
Change-Id: Ie2767056dd04d1131390e3a03d6d82d56fe5b2dc
2024-01-31 07:45:28 +00:00
Xin Li
c7e0649c2e
[automerger skipped] Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future am: 6387b7e6b2 -s ours
...
am skip reason: Merged-In If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0 with SHA-1 40d9abb773 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25973942
Change-Id: Iab2a0d257e1ee92e71cbae270368e48e58637578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 02:08:23 +00:00
Xin Li
ef99c20d88
[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 6b4b7336bc -s ours
...
am skip reason: Merged-In If21ca5e914a5ee5aff3fbeeee9595bb77a8fc3d0 with SHA-1 40d9abb773 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25973942
Change-Id: I11237ba180ff5fb8504f3f0cf496333efde18830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-31 02:03:15 +00:00
Pawan Wagh
d1a4c2fc6a
Merge "Publish system update info when updates are in progress" into main am: a6bec4e541 am: 023b52dc4d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2930333
Change-Id: Icac941d34287f35c02319f8a536c42af4aa0336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-30 22:52:21 +00:00
Xin Li
6387b7e6b2
Merge "Merge Android 24Q1 Release (ab/11220357)" into aosp-main-future
2024-01-30 22:44:00 +00:00
Pawan Wagh
023b52dc4d
Merge "Publish system update info when updates are in progress" into main am: a6bec4e541
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2930333
Change-Id: I95643df37fae5dbe700914fe93f6b403e1bf07a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-01-30 22:12:16 +00:00
Pawan Wagh
a6bec4e541
Merge "Publish system update info when updates are in progress" into main
2024-01-30 21:28:58 +00:00