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

122916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6a6c2a88a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours am: 53a315463c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ed83e7e72ae4a16e3c861d3cef61c2c6f8ef7f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:16:19 +00:00
Bill Yi
4d798822fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f97401447 -s ours am: 5b8058c497 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d1e85fea1fee3d3eb05d88cd77fa3de39e15afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:16:17 +00:00
TreeHugger Robot
53a315463c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 34ee142399 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I13e43682afabb06f4b6b2db967b6b3ab485f0ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:15:53 +00:00
Bill Yi
56c3675239 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 3365a09592 -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: If0c6dc7970a16bd228b20fcc60e854f141f3f39d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:14:22 +00:00
TreeHugger Robot
c45a51a675 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ibdcdefa96e87c4c3de2edd80e953c770e392ae18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:50 +00:00
TreeHugger Robot
6b256f399c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I86727dd970e5bedffc10d04e37c3aaa1ed8a7b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:30 +00:00
TreeHugger Robot
c51085eaa0 [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: Iac5ba101171a7b726b83da8fda2c63190215caca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:10 +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
Bill Yi
03fcb87f5c [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: Ida756bda0b6cf8503f804210881c7ec4a76fdeb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:12:52 +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
12f8414700 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:53:38 +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
Treehugger Robot
5445cfaca3 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-05-31 16:48:50 +00:00
SongFerng Wang
e4807eb9b8 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: I4a3b5be0db3d818c413476ab8a26492b99e172bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:56:27 +00:00
SongFerng Wang
bbf55cafb9 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev 2023-05-31 07:24:36 +00:00
Julia Reynolds
4b37c06442 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: Ia4388df5e221bf68715414a4aa00c627bf6213ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 17:31:15 +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
daf2fdc6f5 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: I28c20f78b759b6fd08ace5d5de632d1030cdb8a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 12:43:12 +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
24b9862450 [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: Ife8d5ebaf1567a4114a3d8266913442eeb8f91f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 10:26:56 +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
43bb90a8f5 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: I2ba239dbb707c1f84cbb66e4a134c449fbcb32ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 04:47:30 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Chaohui Wang
22b3c0462f Update activity name for ManageFullScreenIntent am: 94906cfe3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: If08b27be6aaa9df2544040a00dac88620de40e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 02:37:25 +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
ac9067d1cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7cd9f3982c8ddf5832ef56410c12f33b351d42cb
 2023-05-29 05:15:19 -07:00
Bill Yi
9b9b56de09 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I449a70434b8159ca38dc0456b8f2d6a36af14a0c
 2023-05-29 05:13:24 -07: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
TreeHugger Robot
5c238c0f5b 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: I884689419cbd75a43c78917d918833766c954453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 19:13:04 +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
f483a19888 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: I26438fbf63e70f412ccdc6e6d94e5a2ade2c9697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 18:52:25 +00:00
Julia Reynolds
d94d3eb622 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: I6195ee972e89c2428d0c95692d152fb8342b0310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 18:52:06 +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
ca3c3ae9d1 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: I2a6f69fc3ee9d52a2bf46cfe14f9dcd5eef6252a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 12:53:10 +00:00
Tom Hsu
b1b4e25f33 Merge "[Settings] Add data roaming observer" into udc-dev 2023-05-26 11:56:20 +00:00