Bill Yi
49e8ae680f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e0c4e5bdc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035807
Change-Id: I717c9a7a099ce59ac3487d09b50e0bf620b76dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 05:41:46 +00:00
Bill Yi
db81d7d5ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c8be26784c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035382
Change-Id: I49d728662f4953943c069d486d3345d02a7fd1da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 05:41:29 +00:00
TreeHugger Robot
83ffbfacbc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-09-26 05:13:10 +00:00
Bill Yi
180a8c3925
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours am: 9c58f1e6d5
-s ours am: 9e24f47b92
-s ours am: d4accc6881
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Ifd24d16bba3c959397e22a940567576ae2c0d2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:28:47 +00:00
Bill Yi
bbf761d57b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours am: fc1eb27c1c
-s ours am: cf6bdfbf1c
-s ours am: 9f6069250c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I63346549fb2a25193c8cd28985bbfe96a259e438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:28:33 +00:00
Bill Yi
9530502d6a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours am: 687ba7a903
-s ours am: 3f81e0c4f4
-s ours am: a15d043618
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I131d3677c827e716d579fd67da42759a9444f24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:28:14 +00:00
Bill Yi
33045b4e93
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours am: 7687eee85f
-s ours am: 99dffa3013
-s ours am: 093f59ea7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I54198d4bf93d70f3deaf28da93e6beff1cdb46ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:27:50 +00:00
Bill Yi
d4accc6881
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours am: 9c58f1e6d5
-s ours am: 9e24f47b92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Icd7e614320e4a387d8192731b10375c304d42002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:08:38 +00:00
Bill Yi
9f6069250c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours am: fc1eb27c1c
-s ours am: cf6bdfbf1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Id9d9691802dd0465946c6b6c8b2f74b9c22f474b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:08:22 +00:00
Bill Yi
a15d043618
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours am: 687ba7a903
-s ours am: 3f81e0c4f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I2edddad61a1db601cf779c1f2930783aa1988698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:08:01 +00:00
Bill Yi
093f59ea7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours am: 7687eee85f
-s ours am: 99dffa3013
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I2a5a0d35bca900dfaec8e19f2b123e374ccb2dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:07:38 +00:00
Bill Yi
9e24f47b92
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours am: 9c58f1e6d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Id3d18979de5a6edcafa9c9873842f192e5bc2fc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:43 +00:00
Bill Yi
cf6bdfbf1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours am: fc1eb27c1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I64e785ee741a47e1852645b5013c9cf5f9fc9977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:28 +00:00
Bill Yi
3f81e0c4f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours am: 687ba7a903
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic3b007c53d6692c289c3cc4205b709d8fe64a6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:02:08 +00:00
Bill Yi
99dffa3013
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours am: 7687eee85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I3133d34aed69f46827676b1ebd82930caa98b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:01:46 +00:00
Bill Yi
9c58f1e6d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:25 +00:00
Bill Yi
1b68f107cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Weng Su
aaa65fc6f0
Restrict Wi-Fi configuration if settings UI is restricted
...
- Don't launch W-Fi configuration settings if the settings UI is restricted (including guest users).
Bug: 246301667
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Id82498f41765f955e01bb311bb221d26f9574f31
2022-09-26 03:35:12 +08:00
Bill Yi
2b38f742e1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 751384c381
-s ours am: bb51df31b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035810
Change-Id: Iddf759bd6ca70c3fec5be01a52d314347997064d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-25 18:09:22 +00:00
Bill Yi
bb51df31b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 751384c381
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035810
Change-Id: I986d17bf3773a1abb0301cfb91da042a5a818ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-25 04:30:14 +00:00
Bill Yi
b5273ac080
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-25 04:13:04 +00:00
Bill Yi
19edfdd6cb
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-25 04:13:04 +00:00
Weng Su
d0cd5492e4
Separate Tether summary "Off" to dedicated string ID
...
- Separate Tether summary "Off" to dedicated string ID for special language translation
Bug: 228573128
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=TetherPreferenceControllerTest
Change-Id: I0615eb03d6329ef73b714af39e78836ae17ea408
2022-09-24 23:03:53 +08:00
Treehugger Robot
eff730475e
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
am: 984e74a32e
am: 5d95b855dc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: I147a3065c4b214508b325c02e95da68ad22fec0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 10:57:12 +00:00
Treehugger Robot
5d95b855dc
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
am: 984e74a32e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef
Merge "Settings: Protect sensitive data on the about phone"
2022-09-24 08:23:53 +00:00
Bill Yi
65607e2870
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5717c61b030e6fd59c90eb32059ab1c9633b4639
2022-09-23 12:01:04 -07:00
Bill Yi
8ac2386e75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96d30e86a9d27729037d579b1013e4ce814c3d55
2022-09-23 11:57:10 -07:00
Bill Yi
a068e61a94
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
2022-09-23 11:01:33 -07:00
Tom Hsu
f2a63608ba
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
am: 1a4f16cd70
am: db0ec844f2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: I399a80e1e609a14c2f6c821e8e3df36fa8983dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 17:12:22 +00:00
Bill Yi
0ebebf22f6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1
-s ours am: faa0e7298c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: I212a243f97e83f2adf9287804724d1597e4209ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 16:57:56 +00:00
Bill Yi
b6e338ddc1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab
-s ours am: 627c3d311c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: I26c8becbed3932544290e9bca1dd9b2d65cd9c3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 16:57:36 +00:00
Tom Hsu
db0ec844f2
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
am: 1a4f16cd70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 08:40:25 +00:00
Bill Yi
c8be26784c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3903a5eb2bf9afbef9e01a6c8a2dd2ace0c5c371
2022-09-23 01:09:13 -07:00
Bill Yi
751384c381
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifaf8bc76ea5a8afb638a8305cd0ec1873a0e3754
2022-09-23 01:06:15 -07:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
e0c4e5bdc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia10e24de0e735de77ae7be26c0febfccf589825c
2022-09-23 01:00:36 -07:00
Tom Hsu
1a4f16cd70
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:59:37 +00:00