PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
143,208 Commits 1 Branch 0 Tags
32cf2e3a11181e89d160930b55c8d4e9a45c00a9
Commit Graph

143208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Haijie Hong
1a90869f28 Merge "Make bluetooth profile toggles configurable" into main 2024-09-09 12:56:07 +00: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
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
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
Treehugger Robot
d8b1e2944c Merge "Fix Wi-Fi details crash in secondary users" into main 2024-09-05 05:47:11 +00:00
Chris Antol
d052fb29b7 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: e87c0617b7 -s ours am: 643de3a734 -s ours am: e910f78da0 -s ours am: 131b40d319 -s ours am: 12f8d7bf61 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ia7034c495b3d8d30454194909b254e319fad12fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:32:02 +00:00
Fan Wu
40f375d813 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: c62678a33c -s ours am: bb2a315a2e -s ours am: 3dccfc4c7c -s ours am: 455106410b -s ours am: 47ca313370 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie6984db9711bb7c2acae1926ac1dbf6b711ab511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:31:58 +00:00
Chris Antol
eeadbe918e [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: 56855ee5ce -s ours am: 0c49b61d4d -s ours am: 53c4f14dc2 -s ours am: f7f1b35f55 -s ours 
am skip reason: contains skip directive

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

Change-Id: Id67eb64e20eb4fbf4e240bd98936f92628bab655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:31:46 +00:00
Fan Wu
cd71c70848 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: 6cbd31acf2 -s ours am: 8445123224 -s ours am: 1d2f120c60 -s ours am: 40824d2397 -s ours 
am skip reason: contains skip directive

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

Change-Id: I88037d6bc7b20284607b986bb8351e70d0e3ac01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:31:40 +00:00
Chris Antol
24aa91d718 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: e87c0617b7 -s ours am: 643de3a734 -s ours am: e910f78da0 -s ours am: c6b0ceb3e9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I2832afa14c07f67c9d0624f3145d94d10b1efba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:20:53 +00:00
Fan Wu
2b8bec3662 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: c62678a33c -s ours am: bb2a315a2e -s ours am: 3dccfc4c7c -s ours am: ddf7560994 -s ours 
am skip reason: contains skip directive

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

Change-Id: If1c710a3d9b7d243d558e65672c895f1c7d1eb6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:20:48 +00:00
Chris Antol
0f6e70060a [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: 56855ee5ce -s ours am: 0c49b61d4d -s ours am: c8e0e40fce -s ours 
am skip reason: contains skip directive

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

Change-Id: Iedca58f8f484dc53ca0994b7f577ee68427bf2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:20:31 +00:00
Fan Wu
93c25f9a07 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: 6cbd31acf2 -s ours am: 8445123224 -s ours am: 922b573ce0 -s ours 
am skip reason: contains skip directive

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

Change-Id: I61b0c6ff98586205190bfc33920b103363a6d9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:20:25 +00:00
Chris Antol
12f8d7bf61 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: e87c0617b7 -s ours am: 643de3a734 -s ours am: e910f78da0 -s ours am: 131b40d319 -s ours 
am skip reason: contains skip directive

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

Change-Id: I324aa7755778ab3cc9db44aab1c5672e9ad892ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:20:00 +00:00
Fan Wu
47ca313370 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: c62678a33c -s ours am: bb2a315a2e -s ours am: 3dccfc4c7c -s ours am: 455106410b -s ours 
am skip reason: contains skip directive

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

Change-Id: Iae796aa8a524b8d9f65275f1276b4680b67d1f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:19:55 +00:00
Chris Antol
f7f1b35f55 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: 56855ee5ce -s ours am: 0c49b61d4d -s ours am: 53c4f14dc2 -s ours 
am skip reason: contains skip directive

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

Change-Id: Iec5c9fcbe2ba57e0b92112043cb8d9b36c3d430e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:19:43 +00:00
Fan Wu
40824d2397 [automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93 -s ours am: 14ef364e16 -s ours am: 7eb7f4d12b -s ours am: 1a7d021bc7 -s ours am: 6cbd31acf2 -s ours am: 8445123224 -s ours am: 1d2f120c60 -s ours 
am skip reason: contains skip directive

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

Change-Id: I4de86a3baf4a114e8a7d29b1bf4e0abc534f62d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:19:38 +00:00
Chris Antol
131b40d319 [automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631 -s ours am: f927599ebb -s ours am: 97e33fc9a9 -s ours am: 439a39b81f -s ours am: e87c0617b7 -s ours am: 643de3a734 -s ours am: e910f78da0 -s ours 
am skip reason: contains skip directive

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

Change-Id: I26b6ef6f14743c421be9c009eff106caaf0a2673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 04:10:13 +00:00