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

122941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
10cb85a272 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cd3e51654c -s ours am: 16f5f3cf3d -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I382bc02d9c504043841a8e67e304ca35fb893b18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:29:09 +00:00
TreeHugger Robot
352a55249d [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: I3f170837d1872a736326ac2b6c4e0356d456ff7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:17:19 +00:00
Bill Yi
5ef725d59a [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: Iabccc01460fd784dfd5031fac851478195c46602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:17:14 +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
c4f7b4c792 [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: I5de4989ec3b0a8dd78543c0b9cb465ae611e19eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:15:08 +00:00
TreeHugger Robot
f8b09e115a [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: If3bc7684a16d5e023d7db31d4796e4bb553bce7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:14:29 +00:00
Bill Yi
27cdb764dd [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: Icc42e38b5b838b128e20f96cf53f719e213decab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:14:18 +00:00
TreeHugger Robot
647555b203 [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: I8cc8f221b787a9f82498355076e74943bf28d791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:14:11 +00:00
Bill Yi
415c6816c2 [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: Ifa2f8a4cd867263e57ec9ed7868424d2f0c0ebdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:58 +00:00
TreeHugger Robot
fc7894b9cd [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: I540deef195d21dabea0fb68519cf8842ab65ad18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:38 +00:00
Bill Yi
9fdc25a0f6 [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: I3ba1d73cbe300ad5c62b9d081dc2bebaa56482cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 18:13:13 +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
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
TreeHugger Robot
6bbc4c9532 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
TreeHugger Robot
2d464152ad Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
TreeHugger Robot
53b782e43b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-05-31 16:51:39 +00:00
SongFerng Wang
623fd259f7 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: I5e3335db194374187c3d3ad575e0db04795e2f02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-31 07:56:29 +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
d8cfa9ad5f 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: Ia98d55bdd0625ff9ee7fea83915b1f81bf591159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 17:31:25 +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
3eb25a2df0 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: I0c24c04fb3bb769026e3794c461dddb926308219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 12:43:14 +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
ec08c23c6e [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: I8baa97b805f451606e4f07d473e580bdd0b3fa9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 10:29:14 +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
261a252a84 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: I0d50d150c413f1fa9e17948e844a1331e85c21c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 04:47:26 +00:00
TreeHugger Robot
b98d6644ed Merge "[Settings] Remove redundant sort" into udc-dev 2023-05-30 04:05:22 +00:00
Chaohui Wang
1d7e22ee3a Update activity name for ManageFullScreenIntent am: 94906cfe3d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: Iff1262707d748b08ce5818b0e9d558026d877502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-30 02:37:28 +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
241da8be39 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c387f01cd7090a26c171a311717564f1ce45dd2
 2023-05-29 01:02:42 -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
7f09268e95 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I168bc52fa4cf69d3deec0d29dbfe4b34308f3dfb
 2023-05-29 00:57:24 -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
317c0985d1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe62fd0f3c35b0786f4e3b846174540802d8b2da
 2023-05-29 00:53:30 -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
TreeHugger Robot
1efd1f6d3c 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: I3c68a806fa8849b68f0e853a181d3f2859e485a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 19:13:08 +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
424440670d 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: I9d29601614b0f166afc898f99e3ee87df974abf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-26 18:52:36 +00:00