PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,825 Commits 1 Branch 0 Tags
b94d42a51a22bf14c5481a2bfbeed56e0d41fb9f
Commit Graph

122825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0c23e24eb8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie20d4e1e662aa379c9fc128c19e193f3f5c24915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:51 +00:00
Bill Yi
e306564e29 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idac10a099a63c691ef6b7e573a7ec8bde54b103d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:34 +00:00
Bill Yi
2d3730c6e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I80facf9912d1fccb9e1b9e6264d9bb699112d2f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:31 +00:00
Bill Yi
3365a09592 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida66b7c7e1e05bbab33e21143f9af1f812136dcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:06 +00:00
TreeHugger Robot
672ba73070 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-31 16:55:16 +00:00
TreeHugger Robot
34ee142399 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-05-31 16:55:11 +00:00
TreeHugger Robot
6834cfffe4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
TreeHugger Robot
c2a92b394e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
TreeHugger Robot
fef0572018 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-31 16:52:26 +00:00
Pavel Grafov
8112fb3828 Avoid double quiet mode requests 
Currently when "Work apps" the toggle is tapped in Settings it leads to
UM.requestQuietMode() being called twice via different routes.

Bug: 284915370
Test: atest WorkModePreferenceControllerTest
Change-Id: I5eeb7ecdb10245a32d947ae2430a865bd7a5a60a
 2023-05-31 13:56:42 +01:00
Weng Su
086d062cb2 Fix TetherSettings crash issue 
- When the user is a guest user, the UI will remove all preferences to restrict setting changes. If the ViewModel updates the UI in this situation, it will cause Settings to crash.
  - Avoid to setup ViewModel when UI is restricted

Bug: 284435378
Test: Manual test
atest -c TetherSettingsTest

Change-Id: I52d4ea717c34eacc9cc2321e3950dc89408049f8
 2023-05-31 20:38:36 +08:00
SongFerng Wang
2d2f90fa38 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: I569db5421a70731f2f0666e9ef187422cff712e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:57:05 +00:00
SongFerng Wang
bbf55cafb9 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev 2023-05-31 07:24:36 +00:00
Chaohui Wang
f0dc0933c3 Fix padding issue on Scan QR code screen 
Fix: 284826809
Test: Manually when set Font and Display size to maximum
Change-Id: I3c67b5603d27cefdb4776a43d72264051f40246f
 2023-05-31 06:41:34 +00:00
Julia Reynolds
f842b7754b Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: I5d11d6500b35be8b59f9e298c701775638b60858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 17:31:26 +00:00
Julia Reynolds
a171a9d426 Merge "Update string to be phone/tablet agnostic" into udc-dev 2023-05-30 16:48:52 +00:00
SongFerng Wang
07d8970208 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I5c9c9ef6d4d58542b7277ea67b16c222577967cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 12:38:53 +00:00
SongFerng Wang
c4ed48cbe4 Merge "Try to avoid the timing UI issue" into udc-dev 2023-05-30 12:00:39 +00:00
Zoey Chen
6c5b2f34cf [Panlingual] Remove the large space when searching language am: 1f76872d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442455

Change-Id: I319f8070f4cd02842f397789d6495a8f27e2ad5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 10:29:14 +00:00
Edgar Wang
2917c0c1c0 Revert "Revert "Update theme for ChannelPanelActivity"" 
This reverts commit bbef903b88.

Reason for revert: This CL is fixing notification panel theme issue.

Change-Id: I6bcd8c8f1e8d2f2bd2f7896ebf45d36f67f570b9
 2023-05-30 08:28:30 +00:00
SongFerngWang
0f3f6086e9 Try to avoid the timing UI issue 
Tester exit network scan interface and then enter network scan activity
immediately. The previous network scan stop command effect the current
network scan.

Move "stop network scan" to first at onStop.

Bug: 276679520
Test: Build pass.
Change-Id: Ib0125c3745537a82b7574a8580d2a02c4e3644a0
 2023-05-30 15:18:28 +08:00
Zoey Chen
1f76872d78 [Panlingual] Remove the large space when searching language 
Don't expand the tool bar when users search the language because they will see a large space on the top.

Bug: 284480214
Test: local test
Change-Id: Ie8653536117a999bd420ccfce961b17fe9349d35
Merged-In: Ie8653536117a999bd420ccfce961b17fe9349d35
 2023-05-30 05:44:13 +00:00
TreeHugger Robot
597f143627 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I0ae4060e85b81360d84e22d55aa113c65e08f114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 04:43:09 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Chaohui Wang
baf7e7e2a7 Update activity name for ManageFullScreenIntent am: 94906cfe3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iab8361606bdb337c987498784f648da4b80e7a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 02:33:09 +00:00
Chaohui Wang
94906cfe3d Update activity name for ManageFullScreenIntent 
Bug: 243421660
Change-Id: I3397d6d59895694185c0d9067da636623c08d3ac
Test: m Settings
Test: adb shell am start -n com.android.settings/.ManageFullScreenIntent
 2023-05-29 17:11:08 +00:00
Bill Yi
b57ebe9c3b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If0dd51dfcd926f41da7f563eff00939b54fb2f03
 2023-05-29 01:01:54 -07:00
Bill Yi
adefb73221 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I783506712d5b1c5887f9d955cbd838f44cde34b7
 2023-05-29 00:59:12 -07:00
Bill Yi
2bcb8c25fd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib310d2df9ad9db0645aeea62d9ee37c758ebe03c
 2023-05-29 00:55:43 -07:00
Bill Yi
3f97401447 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7a3f1cb5958809c0b34692b456170a921df0a7dc
 2023-05-29 00:54:17 -07:00
Bill Yi
e841794da4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I82e853e8a4336fd40b50451a83a435740719a87b
 2023-05-29 00:52:42 -07:00
Bill Yi
cd3e51654c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I50112e91300526751158c02ab03960f005b60c39
 2023-05-29 00:51:07 -07:00
Bill Yi
e9d26cfdce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I481b414f50fc988072ec462c2e6ac4f48fe69585
 2023-05-29 00:49:34 -07:00
Weng Su
25d259e3e2 Restrict SimDialogActivity 
- Restrict UI if user is a guest

- Restrict UI if user has DISALLOW_CONFIG_MOBILE_NETWORKS

Bug: 262242946
Bug: 271849181
Test: manual test
atest -c SimDialogActivityTest

Change-Id: I227400aa71880895d8356f3d2961cb610ad2a357
 2023-05-29 07:03:19 +00:00
Automerger Merge Worker
c2b075b387 Merge "Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 2bb637fcc2" into udc-dev-plus-aosp 2023-05-26 19:57:28 +00:00
Treehugger Robot
c93a4e7875 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 2bb637fcc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: If0f46143aa0c2b4ad9ede55a21282f55b564a909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 19:57:22 +00:00
TreeHugger Robot
ba5bf3e18f Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: Iafaadf2f8338b5bc52de8323787ce1c6926ad92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 19:57:20 +00:00
TreeHugger Robot
1df5ad89ee Merge "Update bad calibration error message" into udc-dev 2023-05-26 18:59:46 +00:00
Julia Reynolds
3bf7130628 Update string to be phone/tablet agnostic 
Test: View NotificationChannel UI
Fixes: 279155066
Change-Id: I6d02a863a27092e35e66023966b3e007c6b45d7b
 2023-05-26 14:57:59 -04:00
Treehugger Robot
f8b14c6049 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ib173215d93105852a2d611eae76d0eafb7e34b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 18:48:13 +00:00
Julia Reynolds
08145209c6 Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I56363190316fb102e56e38e5096e008fb4a7984b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 18:47:23 +00:00
Treehugger Robot
2bb637fcc2 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I2f9d6bba0bad509cbe0ca2b42dea01a697e2c80c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 17:44:52 +00:00
Treehugger Robot
24db1f3393 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: Ifa1155d2a3ae19ff743b29b47e088d5d42724f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 17:44:20 +00:00
Diya Bera
1069105558 Update bad calibration error message 
Test: Manual - send bad calibration error in code and observe the
strings
Bug: 280786940

Change-Id: I999750b98fcfd83a6fd265bac0aa334342c9f536
 2023-05-26 10:26:59 -07:00
Julia Reynolds
3ab478416d Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev 2023-05-26 16:46:50 +00:00
Treehugger Robot
5fa6d3b7dc Merge "Restrict Printing Settings" into tm-qpr-dev 2023-05-26 16:28:03 +00:00
Julia Reynolds
bbef903b88 Revert "Update theme for ChannelPanelActivity" 
This reverts commit 41eeb31b20.

Reason for revert: b/284380876

Change-Id: Ia06bf047db187091753e560f70427abb5b26378a
 2023-05-26 15:32:08 +00:00
Tom Hsu
1b6b5ea7e7 Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I345ffb00c6685c86d17edc4de13d47815925239f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 12:48:57 +00:00
Tom Hsu
b1b4e25f33 Merge "[Settings] Add data roaming observer" into udc-dev 2023-05-26 11:56:20 +00:00
tom hsu
f2bf350303 [Settings] Remove redundant sort 
- Use sql command to sort subscription info data instead of current.

Bug: 284306899
Test: Manual test
Change-Id: Ie0c5f5614a336771f865f02e7675b4e125ff15bb
 2023-05-26 10:14:49 +00:00