PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
138,921 Commits 1 Branch 0 Tags
76d7864bc6dfca0d2ee25576489c1cc4936f0587
Commit Graph

138921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
fe3023d496 [automerger skipped] Merge "Merge Android 14 QPR2 to AOSP main" into main am: 12e4524868 -s ours 
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49 is already in history

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

Change-Id: I07caaffd876b2cdfcf53b63a76eea24b3f64c30e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:57:57 +00:00
Xin Li
ac425a05cb [automerger skipped] Merge Android 14 QPR2 to AOSP main am: a80653d111 -s ours 
am skip reason: Merged-In I309e4d56dc379680d07bf1e28648ca620b824bad with SHA-1 887741ee49 is already in history

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

Change-Id: I5c754c832b54501813c71cdb14b719b33029155c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-07 09:54:56 +00:00
Xin Li
12e4524868 Merge "Merge Android 14 QPR2 to AOSP main" into main 2024-03-07 06:41:13 +00:00
Xin Li
a80653d111 Merge Android 14 QPR2 to AOSP main 
Bug: 319669529
Merged-In: I309e4d56dc379680d07bf1e28648ca620b824bad
Change-Id: Idce3726e1ade60db7b02c9995ecb43cfa1986ff0
 2024-03-06 09:30:06 -08:00
Treehugger Robot
887741ee49 Merge "[Thread] fix wrong kotlin argument name" into main am: dee4388b93 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2984352

Change-Id: I309e4d56dc379680d07bf1e28648ca620b824bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-05 15:22:33 +00:00
Treehugger Robot
dee4388b93 Merge "[Thread] fix wrong kotlin argument name" into main 2024-03-05 14:31:02 +00:00
Harry Cutts
3c1a5bb3c0 Merge "Touchpad: add Framework Input team as owners" into main am: a3a04112fd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2982053

Change-Id: Idf76ff1bf592de800d224052910927285c47c42e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-03-05 12:05:02 +00:00
Harry Cutts
a3a04112fd Merge "Touchpad: add Framework Input team as owners" into main 2024-03-05 11:17:46 +00:00
Android Build Coastguard Worker
7147196c42 Snap for 11526283 from a6f283382a to 24Q2-release 
Change-Id: I97724f2b3f3a2afab2dc784dad328b9cb963c3e2
 2024-03-05 00:49:21 +00:00
Treehugger Robot
a6f283382a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-04 17:25:26 +00:00
Treehugger Robot
fd54b422d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-04 17:25:26 +00:00
SongFerng Wang
71c6c3e557 Merge changes I96574a79,I74681222 into main 
* changes:
  Fix the testcase failed
  Add the log for SidecarFragment
 2024-03-04 12:27:37 +00:00
songferngwang
c9a3eeb792 Fix the testcase failed 
Add mock for SubscriptionManager.createForAllUserProfiles

Bug: 323652989
Test: atest MobileNetworkPreferenceControllerTest
Change-Id: I96574a79eba581db95d387f0d9c9fde2e004c41c
 2024-03-04 10:58:22 +00:00
Charlotte Lu
3b856490e8 Merge "Change WepNetworkDialogActivity exported="true"." into main 2024-03-04 10:15:53 +00:00
songferngwang
0d7d180246 Add the log for SidecarFragment 
The system miss the SidecarFragment result, so the settings did not
active the esim.

Bug: 302505660
Test: NA
Change-Id: I746812220fed001eddc7d4aeeaf7aa0b04b86692
 2024-03-04 10:10:30 +00:00
SongFerng Wang
d94a556939 Merge "Fix SimDialogActivityTest" into main 2024-03-04 08:48:11 +00:00
Zaiyue Xue
62132fffb2 Merge "Update the logic for logging anomaly information to WW." into main 2024-03-04 08:00:08 +00:00
Zaiyue Xue
a399c73ba0 Merge "Fix anomaly is not logged in non-debug mode." into main 2024-03-04 07:55:18 +00:00
Chaohui Wang
66dacdf050 Merge "Create phoneNumberFlow" into main 2024-03-04 07:48:37 +00:00
Angela Wang
6089d3edd6 Merge "Replaces HearingDevicePairingDetail with HearingDevicePairingFragment" into main 2024-03-04 06:53:19 +00:00
Chaohui Wang
c8edb018a4 Create phoneNumberFlow 
Bug: 318310357
Test: manual - on Mobile Settings
Change-Id: Ib80b6c510ebd89650557240add23d914934ba6c9
 2024-03-04 13:52:18 +08:00
Zaiyue Xue
87ecb92e6e Fix anomaly is not logged in non-debug mode. 
Proto is not supported to fully toString() in non-debug mode.

Bug: 327978756
Fix: 327978756
Test: manual
Change-Id: I1231c40769fd345b500ec120cf9c6fca3eb7c54a
 2024-03-04 13:24:13 +08:00
Jacky Wang
16a99aecae Merge "[DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage" into main 2024-03-04 03:58:29 +00:00
Weng Su
1a2d60a867 Merge "Ignore failed Wi-Fi unit tests" into main 2024-03-04 03:47:47 +00:00
Zaiyue Xue
51740f6540 Update the logic for logging anomaly information to WW. 
Bug: 316075226
Test: manual
Change-Id: I22198ee1ae3cedee6ee9d2e8191423000ba32af2
 2024-03-04 10:47:29 +08:00
Chelsea Hao
7eb6df8ee7 Merge "[Audiosharing] Remove audio streams from settings." into main 2024-03-04 02:33:18 +00:00
Weng Su
777157b5b4 Ignore failed Wi-Fi unit tests 
Bug: 323645528
Flag: None
Test: unit test
atest -c SettingsUnitTests:RequestToggleWiFiActivityTest \
         SettingsUnitTests:WifiDialog2Test \
         SettingsUnitTests:WifiUtilsTest

Change-Id: I8d3ddb1eb775b8758cb359cac4dac39bb9c8dfed
 2024-03-04 06:07:40 +08:00
Jacky Wang
006bf17c4f [DataStore] Migrate BatteryBackupHelper to BackupRestoreStorage 
Bug: 325144964
Test: Manual tests
Change-Id: I19f7c78969d70648d1e45f1627827d98b1fdd1e0
 2024-03-03 22:42:00 +08:00
Android Build Coastguard Worker
49cfbcc552 Snap for 11521484 from bec4c9573e to 24Q2-release 
Change-Id: I086a5d8514a9b53b90a94e4e4eb47dac4e074bcf
 2024-03-02 22:21:12 +00:00
songferngwang
3f6d1dc3e5 Fix SimDialogActivityTest 
Can't create handler inside thread

Bug: 323649089
Test: atest SimDialogActivityTest
Change-Id: I678a1a1841ab1e1cd87c358fbb3d52cbfb55dbe4
 2024-03-02 14:45:47 +00:00
Chaohui Wang
bec4c9573e Create isSubscriptionEnabledFlow 
To better display the isEnable checked state.

Bug: 318310357
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ia595e7445650ad67883f1e7c1a0662cb826565ea
 2024-03-02 05:01:28 +00:00
Bill Yi
2d9d67e1ab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ca02b24a8caada2f029fe0404380cd4b5a19bf6
 2024-03-01 18:35:22 -08:00
Bill Yi
dffd47e40f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7b7532edc5b9fea79f8316e27ddb64e83dbc22d5
 2024-03-01 18:33:40 -08:00
Android Build Coastguard Worker
de6d552cf7 Snap for 11520864 from 14f9f67df6 to 24Q2-release 
Change-Id: Idcefa9f228f317f3793b39194e32ae4d9eb0452f
 2024-03-02 02:21:10 +00:00
Treehugger Robot
29e984b13a Merge "settings(dev): Remove NFC stack logging control" into main 2024-03-02 02:16:24 +00:00
Treehugger Robot
14f9f67df6 Merge "Make SmartBatterySettings unsearchable when it's not available." into main 2024-03-01 17:56:59 +00:00
Yiling Chuang
93c0dbf98d Make SmartBatterySettings unsearchable when it's not available. 
Bug: 323915905
Test: robotest
Change-Id: I5adc9d19b482b8e07237f5c7d62d315556095c38
 2024-03-01 16:28:12 +00:00
Shaowei Shen
624e1beca8 Merge "[A11y Setting] Add keyboard keys preferences under A11y page" into main 2024-03-01 13:37:03 +00:00
shaoweishen
a5f5ff4add [A11y Setting] Add keyboard keys preferences under A11y page 
Bug: 325851068
Test: make RunSettingsRoboTests
Change-Id: Ic7eb1ec9e260a95d040bee784cbff479a4f087d0
 2024-03-01 12:05:30 +00:00
Jacky Wang
0023b2c16c Merge "Remove NoOpHelper from SettingsBackupHelper" into main 2024-03-01 06:04:28 +00:00
Treehugger Robot
64f740e599 Merge "Revert "Re-enable failed tests under settings/widget/"" into main 2024-03-01 05:02:25 +00:00
Jacky Wang
382f845fd4 Remove NoOpHelper from SettingsBackupHelper 
The NoOpHelper is useless, just clean it up.

Change-Id: Id31217217c9ef1ddde3d2710f79b0572f026accd
Bug: 325144964
Test: Presubmit
 2024-03-01 11:22:10 +08:00
Fan Wu
4826dd8c10 Revert "Re-enable failed tests under settings/widget/" 
This reverts commit cfb73e2dd3.

Reason for revert:
Still failing when running the entire test suite.

Change-Id: I1783265ca8362a2e1d4b89a1d577e1c0a35bd535
 2024-03-01 02:28:07 +00:00
Android Build Coastguard Worker
c75e253458 Snap for 11517367 from 12108acc07 to 24Q2-release 
Change-Id: I09b5a93f800b059e4821d1634e44aa7e5a0bccbf
 2024-03-01 00:21:23 +00:00
Bill Yi
8371b4314b Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-02-29 23:12:59 +00:00
Bill Yi
eba014eb2a Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-02-29 23:12:59 +00:00
Treehugger Robot
408232b483 Merge "Handle NFC settings page routing for the default wallet role." into main 2024-02-29 22:52:11 +00:00
Daniel Norman
b13637cea9 Merge "Add Chun-Ku to A11y Settings OWNERS" into main am: 951cd157de am: af3c4de3c3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2985032

Change-Id: Ife119a2250976b6c03fa17f1d9079e7d43b6ff7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-29 22:28:19 +00:00
Bill Yi
8a2722b819 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a16a9e9d9 -s ours 
am skip reason: contains skip directive

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

Change-Id: I5d2c45f557ee40aa649fb02d8f87cfe66a0e46a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-29 22:08:25 +00:00
Daniel Norman
af3c4de3c3 Merge "Add Chun-Ku to A11y Settings OWNERS" into main am: 951cd157de 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2985032

Change-Id: I66e884b014a5162ea02312fd31030bde7beb859d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-02-29 21:43:19 +00:00