Hani Kazmi
600021d762
Merge "Update missed ECM Settings tests" into main
2024-02-23 14:14:29 +00:00
pajacechen
808573df9b
Add onClick for CardPreference
...
Bug: 326518399
Test: Manual Test
Change-Id: Id56e53cff43d14090ec8c08704a207fd9c829c1d
2024-02-23 21:39:01 +08:00
songferngwang
d1d1e43313
Fixed AutoDataSwitchPreferenceControllerTest
...
The settings Flag is not assigned value, it cause test cases failed
Bug: 326543866
Test: have tested the v2/android-settings/apps/robolectric_settings_test at https://android-build.corp.google.com/builds/abtd/run/L92300030002155909
The test cases of com.android.settings.network.telephony are all passed.
Change-Id: I5a53fb6de741a7550f03ffca3c519d6b67c7c0fe
2024-02-23 10:48:53 +00:00
Mark Kim
94c7bd7e31
Merge "Disable APP_ARCHIVING flag for specific test" into main
2024-02-23 10:08:40 +00:00
Jason Chang
dc5c38c4bf
Merge "Fix enrolled face id can't be deleted when changing device rotation then pressing back key" into main
2024-02-23 09:12:35 +00:00
Chaohui Wang
b3646a4957
Merge "Rename to SettingsDropdownBox" into main
2024-02-23 03:39:46 +00:00
Bill Yi
29b8f505fc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6b558097e2
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26320704
Change-Id: I503947746c8f6f674ed1153b77c07fe83984444f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-23 00:47:43 +00:00
Bill Yi
0cc887b18a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1dcaca0925
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26320704
Change-Id: Ida39ab20632f3f63c7c52f3238dc65a7dcc64f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-23 00:47:38 +00:00
Bill Yi
85ecac89e0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c8799994d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26320702
Change-Id: I7d4e35d92fce15821ffc0cda78dfbcb609b015e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-23 00:47:18 +00:00
Bill Yi
ba07a1aa97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 643cfdb205
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26319443
Change-Id: I558ee70537950387e25dc0ef71c0c1838095add5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-23 00:42:25 +00:00
Bill Yi
6b558097e2
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2024-02-23 00:07:24 +00:00
Treehugger Robot
c76c7ac67f
Merge "Adding FingerprintEnrollConfirmation" into main
2024-02-22 23:56:51 +00:00
Bill Yi
2f20a6ecf1
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-02-22 23:54:53 +00:00
Bill Yi
5f7dab39c3
Merge "Import translations. DO NOT MERGE ANYWHERE" into main
2024-02-22 23:54:53 +00:00
Julia Reynolds
0ca0e22d6e
Merge "Experiment: hide unused channels in settings" into main
2024-02-22 22:47:22 +00:00
Varun Shah
646d052228
Merge "Add new Special App Access screen for Backup Tasks." into main
2024-02-22 21:46:53 +00:00
Joshua McCloskey
0fe0f4d9ae
Adding FingerprintEnrollConfirmation
...
Bug: 295217067
Test: atest FingerprintEnrollConfirmationScreenshotTest.kt
Test: adb shell device_config put biometrics_framework com.android.settings.flags.fingerprint_v2_enrollment true
Change-Id: I0b4995a97b7bccd35e26ed89bbbf14b80af4b0e1
2024-02-22 18:28:08 +00:00
Nate Jiang
a8d381dce0
Merge "Move to new read only flag" into main
2024-02-22 16:54:06 +00:00
Joshua Mccloskey
366e8e38e6
Merge "Fixed fingerprint enroll test" into main
2024-02-22 16:40:01 +00:00
Mark Kim
194d7f7687
Disable APP_ARCHIVING flag for specific test
...
APP_ARCHIVING flag was introduced to control archiving feature in
Settings separately from OS.
The broken test was expecting archiving feature flag be disabled but it
didn't take into account a newly introduced flag which was automatically
rolled out in ag/26270549
Test: InstalledAppCounterTest
Bug: n/a
Change-Id: I253cf7e6b28c9f1508c3f9fd1104fdb06b8706c2
2024-02-22 16:18:59 +00:00
Olivier Nshimiye
75ada354ed
Merge "Add a toggle for enabling/disabling sensitive lockscreen notifications for Private Space" into main
2024-02-22 14:22:33 +00:00
Treehugger Robot
f515a0a440
Merge "Update the datetime page UI" into main
2024-02-22 13:57:09 +00:00
Hani Kazmi
544e471ec2
Update missed ECM Settings tests
...
Bug: 297372999
Test: atest BluetoothDetailsRelatedToolsControllerTest
AppInfoDashboardFragmentTest
Change-Id: Icd83b70b0621f71cc4a253375c65ff6cce34b672
2024-02-22 13:51:36 +00:00
Chris Göllner
617c1275bb
Merge "Settings - Move Activity embedding split min width config to resources" into main
2024-02-22 12:30:55 +00:00
Olivier Nshimiye
baecaee2a5
Add a toggle for enabling/disabling sensitive lockscreen notifications for Private Space
...
This adds a toggle in the Private Space Settings page to control the
lockscreen sensitive notifications for the private profile.
Sensitive notifications for private profile will still be disabled if
sensitive notifications are disabled for the main user.
Demo link:https://drive.google.com/file/d/1--LNXziTRTMvfdsJZAh90SiNiPxWNcI8/view?usp=sharing
Bug: 317067050
Test: atest SettingsUnitTests:HidePrivateSpaceSensitiveNotificationsControllerTest
Change-Id: Ie7f18c1a940e5ffd64112a01c48ac9dee58cb1ab
2024-02-22 11:10:54 +00:00
Chaohui Wang
d86cf5e4ca
Rename to SettingsDropdownBox
...
Bug: 326172568
Test: manual - on APN edit
Change-Id: If8c1b2646c585bc4ce99ac950503372f13f5b382
2024-02-22 16:00:34 +08:00
SongFerng Wang
3bc291a3c5
Merge "To extend the character limit for Automatic data switching" into main
2024-02-22 06:15:37 +00:00
Fan Wu
a26f628213
Merge "Fix SurveyMixinTest" into main
2024-02-22 06:02:19 +00:00
Treehugger Robot
59e7d60fb4
Merge "[Shadow] Fix failed test case for battery defender" into main
2024-02-22 05:30:25 +00:00
Joshua McCloskey
0aefad8859
Fixed fingerprint enroll test
...
Test: atest FingerprintEnrollIntroductionTest
Fixes: 326325883
Change-Id: Ib0d0ebff90d401861fa0663403fc2366cd308f22
2024-02-22 03:47:30 +00:00
pajacechen
a20232d7a1
[Shadow] Fix failed test case for battery defender
...
- Fix failed test case in BatteryInfoTest and BatteryDefenderTipTest
Test: http://ab/I73800010248910938
Bug: 315748218
Change-Id: Iaa01a1d777236b7772fa762c94ab094246c38f21
2024-02-22 11:28:44 +08:00
Chelsea Hao
a9178952ae
Merge "Add auto on toggle in settings." into main
2024-02-22 02:53:16 +00:00
Wu Ahan
888d636cfa
Merge "Refactor SfpsEnrollmentFeatureImplTest" into main
2024-02-22 02:14:30 +00:00
Angela Wang
df14dcd437
Merge "Update footer string for hearing device related pages" into main
2024-02-22 01:13:44 +00:00
Joshua Mccloskey
5d6ed31261
Merge "Adding biometric FRR Notification atom." into main
2024-02-22 01:04:07 +00:00
David Liu
1eaffc3f57
Merge "[Two-pane] Fix keyboard navigation issue, searchbar not able to be selected." into main
2024-02-22 00:54:15 +00:00
Jigar Thakkar
f73494e784
Merge "Use SetScreenLockDialogActivity to power screen lock setup prompt" into main
2024-02-22 00:09:16 +00:00
Bill Yi
1dcaca0925
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b8f1a51ba36d13d5196d03285a996b76016652c
2024-02-21 16:01:20 -08:00
Bill Yi
68a3d6d43b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib744cd2e4b704e9eb6ed03ae3be21429fbb23f82
2024-02-21 16:00:27 -08:00
Bill Yi
5c8799994d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac5066bd452c29cf0c7ebe8f9de2cd0596061d22
2024-02-21 15:58:17 -08:00
Bill Yi
ec4a97273e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I203013b067c0807d9d102c3fe76a6b82d5d3a002
2024-02-21 15:56:24 -08:00
Bill Yi
643cfdb205
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iefec5f23be16eb15d1bf1fc2e3fe0b32de9a0a4f
2024-02-21 15:06:49 -08:00
Treehugger Robot
12f99280a0
Merge "Drop platform_apis from android_library" into main am: ff6f53b24a
am: 2605622758
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2971233
Change-Id: Ica708b747589d0daf7c4f62554cb03755b573668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-21 19:43:11 +00:00
Hani Kazmi
05427e6903
Merge changes from topics "ecm-manager", "ecm-tests" into main
...
* changes:
Replace ECM AppOps call with service
Wired remaining SpecialAppAccess for ECM.
2024-02-21 19:29:04 +00:00
Treehugger Robot
2605622758
Merge "Drop platform_apis from android_library" into main am: ff6f53b24a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2971233
Change-Id: I193568ec0dc8884dfa0be634e90b26295658aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-21 19:09:57 +00:00
Treehugger Robot
ff6f53b24a
Merge "Drop platform_apis from android_library" into main
2024-02-21 18:29:16 +00:00
Tyler Saunders
d561342dc3
[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod am: 0ca44d1772
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26154434
Change-Id: Ic230691c42477be55486d7985663ce340bb6acb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-21 18:04:13 +00:00
Chaohui Wang
a69da9f52f
[automerger skipped] Remove ExperimentalLifecycleComposeApi am: 14b8df172f
-s ours
...
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26154434
Change-Id: I778f22bc0e735d6720763baf654e254e2437100e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-02-21 18:04:02 +00:00
Tyler Saunders
0ca44d1772
Merge "Remove ExperimentalLifecycleComposeApi" into udc-mainline-prod
2024-02-21 17:11:33 +00:00
Chaohui Wang
7d58a1f3e8
Merge changes from topic "ApnTypeCheckBox" into main
...
* changes:
Correct the APN type check box
Fix cannot update APN settings in new edit page
2024-02-21 15:56:41 +00:00