Commit Graph

143222 Commits

Author SHA1 Message Date
Yiyi Shen
ea68bb0825 Merge "[Audiosharing] Change main toggle enable conditions." into main 2024-09-10 10:55:36 +00:00
Jacky Wang
e376c586d2 Merge "Catalyst framework integration" into main 2024-09-10 09:00:03 +00:00
Treehugger Robot
e18c3158c6 Merge "[Settings] Remove androidx widget and use Settings widgets" into main 2024-09-10 07:17:05 +00:00
Chaohui Wang
9b118faa3e Merge "Create NrRepository" into main 2024-09-10 03:36:02 +00:00
Yiyi Shen
25796ffed6 Merge "[Audiosharing] Add retry dialog when start fail" into main 2024-09-10 02:40:13 +00:00
Daniel Norman
7db5b7a084 Merge "Makes Caption Language searchable only if captions are enabled." into main 2024-09-09 17:46:01 +00:00
Jason Chang
c3fb1e6d4f Merge "Fix fingerprint enrollment animation is not in correct position." into main 2024-09-09 17:03:00 +00:00
Chun-Wei Wang
32cf2e3a11 Merge "Support alternate button" into main am: 88bbe8fe1d am: 6eccd73996
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020

Change-Id: Ia2853f58135f975bf0f6dd687efee52e622eac8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 14:34:57 +00:00
Chun-Wei Wang
6eccd73996 Merge "Support alternate button" into main am: 88bbe8fe1d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3244020

Change-Id: I875a923cac31bd561ff5a1cbf80000d6a1c3803e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 14:26:02 +00:00
Chun-Wei Wang
88bbe8fe1d Merge "Support alternate button" into main 2024-09-09 14:18:11 +00:00
Jacky Wang
b3e1b527d8 Catalyst framework integration
Bug: 335132588
Flag: com.android.settingslib.flags.settings_catalyst
Test: Presubmit
Change-Id: Ic0f0193fd5cee144f2fab36ae5190156efb7bd10
2024-09-09 21:14:53 +08:00
Haijie Hong
1a90869f28 Merge "Make bluetooth profile toggles configurable" into main 2024-09-09 12:56:07 +00:00
Yiyi Shen
d3f4982f6e [Audiosharing] Add retry dialog when start fail
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858894
Change-Id: I6ffb3433a6284e0b42d9c976c4abcdf835eee06f
2024-09-09 20:01:37 +08:00
Zoey Chen
b90b4961b3 [Settings] Remove androidx widget and use Settings widgets
Bug: 365486042
Test: manual
Flag: EXEMPT bugfix
Change-Id: I4658742b442831121b45833bdf02b36ad33d785d
2024-09-09 08:47:18 +00:00
Jason Chang
386071e91d Fix fingerprint enrollment animation is not in correct position.
1. Change SPFS ring progress bar and lottie animaiton from
layout_marginLeft/ layout_marginRight to marginStart/marginEnd for
RTL language.
2. Modify SPFS ring progress bar and lottie animaiton dimensioin for
RTL language and check three different SFPS projects.

Flag: NONE bug-fixing

Bug: 338911438

Test: manual build and check UI visually.
Change-Id: I88edad459eefbb3c6be337263045cd87685810e9
2024-09-09 07:02:54 +00:00
Yiyi Shen
439873d08e [Audiosharing] Change main toggle enable conditions.
Enable the toggle when:
1. In audio sharing
2. No connected LEA device. We will show dialog to guide users to
   connect a compatible device.
3. Has active device, which means it is a healthy state after broadcast
   -> unicast switch.

Flag: com.android.settingslib.flags.enable_le_audio_sharing
Test: atest
Bug: 305620450
Change-Id: I2c8067f7882df6943beb3704f63a3e1113ce55d2
2024-09-09 14:07:17 +08:00
Haijie Hong
cd7627c9ff Make bluetooth profile toggles configurable
BUG: 343317785
Test: atest BluetoothDetailsProfilesControllerTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I5aea110f7a42ffee20a56dbd9d5621f44311cc66
2024-09-09 13:23:12 +08:00
Pechetty Sravani (xWF)
457ab0748e Merge "Revert "Customize Fingerprint enroll activities"" into main 2024-09-09 05:10:26 +00:00
Pechetty Sravani (xWF)
994bff0033 Revert "Customize Fingerprint enroll activities"
Revert submission 29139483-494-trampoline

Reason for revert: DroidMonitor created revert due to b/365453068.

Reverted changes: /q/submissionid:29139483-494-trampoline

Change-Id: Ie2ab22694e7128e10eb11bf29340023e2bfd1343
2024-09-09 04:06:57 +00:00
Treehugger Robot
6aee1bfe5c Merge "Customize Fingerprint enroll activities" into main 2024-09-09 01:55:52 +00:00
Xin Li
3f7e49dbc6 [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55 -s ours am: d47d22ecaf -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498

Change-Id: I7d04c5adccf6652641769da03bf90531e4e5cc62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 04:23:44 +00:00
Xin Li
04329450b3 [automerger skipped] Merge 24Q3 to AOSP main am: b3356e7c02 -s ours am: 8e32c5a98b -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498

Change-Id: I777a48e2ca0756ce29e5a6c12604c6ca0bd2a597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 04:23:37 +00:00
Xin Li
d47d22ecaf [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3efb972a55 -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498

Change-Id: Idfb56e083de5edfc54c71641994bb56d0903e179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:27:57 +00:00
Xin Li
8e32c5a98b [automerger skipped] Merge 24Q3 to AOSP main am: b3356e7c02 -s ours
am skip reason: Merged-In Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a with SHA-1 b781605c1e is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3258498

Change-Id: I0fdd6e6217e3e07bfdacd195d71710a15347833c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 02:27:53 +00:00
Xin Li
3efb972a55 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Daniel Norman
216353a770 Makes Caption Language searchable only if captions are enabled.
Fix: 354785578
Flag: com.android.settings.accessibility.fix_a11y_settings_search
Test: atest CaptioningMoreOptionsFragmentTest
Test: adb shell pm clear com.google.android.settings.intelligence;
      disable captioning;
      search Settings for 'language', observe caption language missing
      enable captioning;
      search Settings for 'language', observe caption language present
Change-Id: I015d2c77fbd3f7b8fe713bafb3a49a86160ca958
2024-09-07 00:56:13 +00:00
Treehugger Robot
c3cfb42524 Merge "Update main toggle state in User Settings onResume()" into main 2024-09-06 14:29:09 +00:00
MiltonWu
e401ce51ec Customize Fingerprint enroll activities
Provide an interface for ODM/OEM to override Fingerprint enrollment
activities.

Bug: 364794493
Flag: EXEMPT can't apply flag for manifest change
Test: atest SettingsRoboTests:FingerprintEnrollTest

Change-Id: I9e5d904fc9382a9b5eff84a7f462e1a9c16c4ba0
2024-09-06 09:40:58 +00:00
Haijie Hong
680df21339 Merge "Show a dialog if bluetooth key is missing when reconnecting" into main 2024-09-06 08:18:55 +00:00
Treehugger Robot
3ed2123b10 Merge "Fix no content change if activity start from onNewIntent" into main 2024-09-06 07:58:00 +00:00
SongFerng Wang
83a80dd7c1 Merge "Fix the DSDS dialog status" into main 2024-09-06 07:39:25 +00:00
Treehugger Robot
0f49457203 Merge "Launch Wi-Fi details for connected Wi-Fi network" into main 2024-09-06 07:38:02 +00:00
Xin Li
b3356e7c02 Merge 24Q3 to AOSP main
Bug: 357762254
Merged-In: Ib5c41ab9214cf34a17ef02864dccffb5371cfe3a
Change-Id: I26d001b3394eca422bbfd66e36f4456d898e7500
2024-09-05 17:02:57 -07:00
Weng Su
99cd495d5b Launch Wi-Fi details for connected Wi-Fi network
- Since the posspoint Wi-Fi entry can be connected even if the entry is not saved

- Allow to launch Wi-Fi details when the entry is connected but not saved

Bug: 363151879
Flag: EXEMPT bugfix
Test: Manual testing
atest -c NetworkProviderSettingsTest

Change-Id: I004b8a33bdd07cb92e167039949919f255c5303e
2024-09-06 07:42:15 +08:00
Treehugger Robot
dcc2530964 Merge "Populates collection info count for A11y toggle feature pages." into main 2024-09-05 21:27:35 +00:00
songferngwang
74a76a8067 Fix the DSDS dialog status
To avoid the dsds dialog status to reset.

Bug: 364668360
Test: verify enabling DSDS mode
Flag: EXEMPT bugfix
Change-Id: I80a8abd896856740fad1f98de50c79034a4cc602
2024-09-05 18:35:27 +00:00
Treehugger Robot
7b6a49a32e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-05 17:50:52 +00:00
Treehugger Robot
55507f3961 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-05 17:50:52 +00:00
Treehugger Robot
2523ad9a9a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-09-05 17:50:52 +00:00
Treehugger Robot
df1b6069ad Merge "Fix missing word in the revoke modes access confirmation message" into main 2024-09-05 15:01:59 +00:00
tomhsu
74c7f9b65f Fix no content change if activity start from onNewIntent
- Mobile network page can not change content to another subscription
   if this is started from onNewIntent. This is because intent is not
   udpated so current fragment still get the information from old
   Intent.

Flag: EXEMPT bug fix
Bug: 270416514
Test: Manual test passed
 - adb shell am start -a android.settings.NETWORK_OPERATOR_SETTINGS --ei android.provider.extra.SUB_ID x
Change-Id: Ib6aa9d359232ff602551e121b52894a27a84e4e1
2024-09-05 14:13:43 +00:00
Bill Yi
dfbab791f4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3948d287c7bbe6cb0dba97b0fe979611de97aa9b
2024-09-05 05:58:17 -07:00
Bill Yi
77caaca462 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8e24ecfc6c14475a08a6f560fe3119efb6cb3170
2024-09-05 05:55:18 -07:00
Bill Yi
6f3dfe0a37 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I116f21d11612f4efaf64cba7432f441f7552e9c5
2024-09-05 05:52:44 -07:00
Matías Hernández
bcc95a0972 Fix missing word in the revoke modes access confirmation message
Bug: 363445885
Test: N/A
Flag: android.app.modes_ui
Change-Id: I2c7516837c50082193de2ec747c93c4ce6c46f7a
2024-09-05 13:43:52 +02:00
Treehugger Robot
25038de609 Merge "Fix: Show string "Layout" if only single valid IME exists" into main 2024-09-05 11:15:59 +00:00
Chaohui Wang
ecac69fdcf Merge "[Safer intents] App Time Spent Preference" into main 2024-09-05 08:02:36 +00:00
Chaohui Wang
9179ad5fc2 Create NrRepository
To unify the isNrAvailable logic.

Bug: 358000881
Flag: EXEMPT refactor
Test: manual - on mobile settings
Test: atest NrRepositoryTest
Change-Id: I60fed4be10f0cc7b8b1a942abd598e82c53d1473
2024-09-05 15:56:43 +08:00
Weng Su
f1e37ba908 Merge "Increase CHAR LIMIT for Wi-Fi transmit link speed" into main 2024-09-05 07:29:55 +00:00
Zoey Chen
5f3872baad Merge "[Settings] Restore the position" into main 2024-09-05 06:13:19 +00:00