Commit Graph

85880 Commits

Author SHA1 Message Date
Bill Yi
433960b45e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I736645f705abdc03f0605ff32d79c83f9a600366
2021-11-01 06:08:42 +00:00
TreeHugger Robot
671b1b64a7 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4b3001c37cd7cf10fe0e93e3d470c93f818fca0
2021-11-01 06:07:51 +00:00
Bill Yi
94b058a0c1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 4f200606a9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibeeacf435f58eb6f036b97f7534c544bdf76bf1d
2021-11-01 06:07:51 +00:00
TreeHugger Robot
dfb6af177f Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp 2021-11-01 05:46:15 +00:00
Bill Yi
c0eaec8037 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a
Blank merge reason: commit message contains skip directive

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

Change-Id: I424e234e0577d940e6da8a625b4797a292a759c6
2021-10-31 02:28:09 +00:00
Bill Yi
eb45210f6a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I78c311e7d058b10e7b00112ceda5e3ed03381370
2021-10-31 02:28:03 +00:00
Bill Yi
7e2d3bd5ff [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
Blank merge reason: commit message contains skip directive

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

Change-Id: I78ebb7336ae52609b9372f4659b6a8cf4483e942
2021-10-31 02:17:25 +00:00
Bill Yi
4f200606a9 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
Blank merge reason: commit message contains skip directive

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

Change-Id: I15b4087acf755a12fda81f4de18caf0f532165fa
2021-10-31 02:17:24 +00:00
Bill Yi
6ac425087d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7cf4620b089df8bac86ad67c4efffe0ae3f5ad95
2021-10-31 02:17:16 +00:00
TreeHugger Robot
c26248da5b Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
649135c11c Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev 2021-10-27 18:24:26 +00:00
TreeHugger Robot
0d439097e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 48b79c4f7d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0056b7b04e308d6bdeb2533c97fad53d21697f31
2021-10-27 02:11:16 +00:00
TreeHugger Robot
2f0041e4d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47a21aefaf98b243da8b0e5e582b446e06cf1d38
2021-10-27 02:11:11 +00:00
TreeHugger Robot
9106e9620f Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: I81168d13a1443005119e04d6273cbeccbd580c27
2021-10-27 02:11:06 +00:00
Bill Yi
d781548aa6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd9abac9f46ffc7d6998f2c715f34f68ba4f3715
2021-10-27 02:11:03 +00:00
TreeHugger Robot
751b27ec19 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: Icf585266fffc4db9a322e6924dedbd2fc59c08c4
2021-10-27 02:10:53 +00:00
Bill Yi
d26d1fcb48 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If94e2b34699ba396da068c3fc2080b0de9309960
2021-10-27 02:10:52 +00:00
TreeHugger Robot
48b79c4f7d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If077afe3d023be33c98959da914fff0e3a59b0e5
2021-10-27 02:10:44 +00:00
Bill Yi
dc38186e69 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I975aff16356623fd7accf15561dc95d9aefd7caf
2021-10-27 02:10:44 +00:00
TreeHugger Robot
d0240c3795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours am: 06cca879db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0523de0268fb4c2443cfcdd8ed58c4841fa2b3b8
2021-10-27 02:08:50 +00:00
Bill Yi
5e70ebba87 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I084b4d2ac9411ad10a4c267390c8b91379f9eebe
2021-10-27 02:08:46 +00:00
TreeHugger Robot
06cca879db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I414e913bdd299cbff9893077cfbf52e2811cde5f
2021-10-27 02:03:25 +00:00
TreeHugger Robot
778ae33620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-10-27 01:50:53 +00:00
TreeHugger Robot
9bd68e3a97 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-27 01:50:49 +00:00
TreeHugger Robot
5416ffde47 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00
TreeHugger Robot
7b45d4a7ac Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
  Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:46 +00:00
Bill Yi
141d4127f8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I356d775f02056287568b055d49f755efdf1ef901
2021-10-26 18:07:42 +00:00
Bill Yi
8c035094b8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
Blank merge reason: commit message contains skip directive

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

Change-Id: Ia5cac899e699134c9c3dededfec0419871b5f097
2021-10-26 18:04:03 +00:00
Bill Yi
49389665fa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6a2e84d9174edd3eaff854cd7197147fa7888baa
2021-10-26 18:03:56 +00:00
Bill Yi
9975577fd7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24332f87c03f57644fd6ffb3d1819f184a54a170
2021-10-26 17:54:07 +00:00
Bill Yi
f7af4b6fb0 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Blank merge reason: commit message contains skip directive

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

Change-Id: I73f1f4c5f9b93372fd9d02f9b193922c751526cc
2021-10-26 17:52:36 +00:00
Bill Yi
8e49756934 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
Blank merge reason: commit message contains skip directive

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

Change-Id: Ib88fd011aa4e79ac0fbf689dd5c91e249865a767
2021-10-26 17:52:35 +00:00
Bill Yi
a6de7ad6b8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ied645d81839a1c5b98efcdd508a69aeb291a8feb
2021-10-26 17:52:29 +00:00
Bill Yi
4c9877242c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours am: 4bb4205b98 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2677a4bb0fac39636b5a83879c43cb801566e1f1
2021-10-22 01:33:10 +00:00
TreeHugger Robot
17d5b1fc06 Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev am: 3c824a23e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16099516

Change-Id: Ie9e4192c1a90a4f721ff02331df5b54370a5d7b2
2021-10-22 01:21:57 +00:00
Bill Yi
1aa1369fd8 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5 am: bace1bf648 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id40fd4e26953fcf755ac5ea6cc4643720a199e58
2021-10-22 01:21:56 +00:00
Bill Yi
9b4af9ca03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 52146b1b0a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93be458d57eb11d851fcf6570e1dc12345ebc661
2021-10-22 01:21:39 +00:00
Bill Yi
4bb4205b98 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 247075dcd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic29a34b7823931a043d7b419a11dd69118e2f750
2021-10-22 01:17:57 +00:00
TreeHugger Robot
3c824a23e6 Merge changes from topic "presubmit-am-7ec75ddcc57e4269a8bd00190c66c479" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
  Import translations. DO NOT MERGE ANYWHERE
2021-10-22 01:04:30 +00:00
Weng Su
76e3973684 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba am: 8cf3250517
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Ifc9692777cd4e99ee358a4599317b69a619745ac
2021-10-21 13:20:13 +00:00
Weng Su
8cf3250517 Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9 am: 400e5b0fba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-21 13:10:56 +00:00
Weng Su
400e5b0fba Merge "Keep compatibility for old WiFi shortcut" am: ab7640dcd9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1853101

Change-Id: I44f373cab6a829af3e08ab95d62d53a42516d41a
2021-10-21 12:56:02 +00:00
Weng Su
ab7640dcd9 Merge "Keep compatibility for old WiFi shortcut" 2021-10-21 12:38:12 +00:00
Bill Yi
52146b1b0a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idf72f0b25491f38f592613b85cd7e20c5935681a
2021-10-21 08:16:13 +00:00
Bill Yi
bace1bf648 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 247075dcd5
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic81a43d273bbb6f70c73eab5b8c2ea43a3684bf8
2021-10-21 08:12:44 +00:00
Bill Yi
247075dcd5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia2cd9e21b6ad60ef3f4ebabdc7fbe77c752c34f0
2021-10-21 08:12:37 +00:00
changbetty
aab7b55926 Add location check for Wifi Scanning notify message
Bug: 203471614
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: I0fccd1a8dfd8e6ca499a6f87a59772f70961bc1d
2021-10-20 15:14:08 +00:00
TreeHugger Robot
b097e09dd7 Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev am: faf452bf94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16047401

Change-Id: I34e321f6a32401f5b0adcaacf90a63d32e7bccef
2021-10-20 04:53:31 +00:00
TreeHugger Robot
faf452bf94 Merge "Update UWB toggle display after lifecycle events." into sc-qpr1-dev 2021-10-20 04:43:47 +00:00
SongFerng Wang
17fb53a1ad Merge "The Network name is not same as statusbar at SIM Edit page" into sc-qpr1-dev am: 11af4846b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16055430

Change-Id: Idc12ca6b932fc9143a4c83729af16b82fae1669e
2021-10-18 08:25:21 +00:00