Lin Yuan
b9bf6300c4
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b
-s ours am: db2ea2bcbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: I13156739d8298de9caa6cccf23b79099ffce9b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:34 +00:00
Lin Yuan
33c3ae7a6c
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: I1576571af1d404f0bffd2e9f64787d6b24d1b87d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:34:03 +00:00
Lin Yuan
36069908ce
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I5e3c940b4dda8b6b6802c2c49260bbad1e661372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:50 +00:00
Lin Yuan
4daf65ea3b
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860
Change-Id: I879d097018e3d4f99d9a8e9f788820a0729d8b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:48 +00:00
Bill Yi
73cce5c14c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia49f737cc5715a3d46a483f5c4fd695bc72a50ea
2022-06-02 13:33:28 -07:00
Lin Yuan
2074939b44
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569
-s ours am: cf07afd1a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: I9690cf53373f86006294da0356194bd5c60e1893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:28 +00:00
Lin Yuan
1443446609
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b
-s ours am: db2ea2bcbd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: Id019ffef8867d7d9b42d413ebc1c56a972899ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:27 +00:00
Lin Yuan
246f5e231c
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858
Change-Id: Icc131e7dd1fee70832aaf4627f806850963c70c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:20 +00:00
Lin Yuan
381d6120b7
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857
Change-Id: I043e7119d2fe281f085ba99ff12759dc588be57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:16 +00:00
Lin Yuan
cf07afd1a6
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: I5faca0f1d45b2fbc962c507d397a78fb98079f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:01 +00:00
Lin Yuan
95d21bc12f
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev am: 3a95e552c6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I6fdfb9076352a14d139425965fd091a70b7c4f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:33:00 +00:00
Lin Yuan
d78ed7aa73
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 78799a550a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18696386
Change-Id: I1d6ccb2b76503875626f5422db30b90442114f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:32:59 +00:00
Lin Yuan
db2ea2bcbd
[automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18690005
Change-Id: I3ec9011a5e3bd003773ccb1faffe324f54630ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 20:32:58 +00:00
Bill Yi
8f7ce798e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic884cd038873ee7aaa8468e81fb1c07408dcc251
2022-06-02 13:29:41 -07:00
Bill Yi
0f02336db9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5af54bdbbb4c33a228efbadfc95a72cd06e3c4f
2022-06-02 13:26:34 -07:00
Bill Yi
c9d17d7191
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia17562a54d6c2fd54cc34c1e4b08cb6d02c69dcb
2022-06-02 13:22:44 -07:00
Lin Yuan
d765af048a
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev
2022-06-02 19:59:49 +00:00
Lin Yuan
3a95e552c6
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into rvc-dev
2022-06-02 19:59:42 +00:00
Lin Yuan
97c15312fa
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev
2022-06-02 19:59:35 +00:00
Lin Yuan
0920be7e46
Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev
...
* changes:
[automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
2022-06-02 19:59:35 +00:00
Lin Yuan
5b0617f569
Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev
2022-06-02 19:59:26 +00:00
Lin Yuan
6ffe64a0a9
Merge "Fix: policy enforcement for location wifi scanning" into tm-dev
2022-06-02 19:59:07 +00:00
Muralidhar Reddy Mule
a534440e80
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 095babe570
am: 74c30fff1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: Ia2594a29e9189fe53715ea872134c1f2a7706249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:42:34 +00:00
Muralidhar Reddy Mule
9d83f8d8cf
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 8d9c7445a8
am: 5e1da1db62
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: I78d9154908e24f1c15c8bb9a15989dab0abea4c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:41:09 +00:00
Muralidhar Reddy Mule
74c30fff1b
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 095babe570
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: Ia61be54cba497230a11efc5c3d53de4cb65620eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:16:07 +00:00
Muralidhar Reddy Mule
5e1da1db62
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
am: 8d9c7445a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: I7e045c9ad7d98430397a7db09ae8439e3e24f016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:15:50 +00:00
Muralidhar Reddy Mule
8d9c7445a8
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: Ie6673d39e96342de744f7ffad2bf3f49b8ff1805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:02:19 +00:00
Muralidhar Reddy Mule
095babe570
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508
Change-Id: I7b99e0f0b465f97c2ce6446ac13805da1409a30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 17:02:13 +00:00
Muralidhar Reddy Mule
77381e7e35
Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev
2022-06-02 16:40:16 +00:00
Avinash Vadlamudi
9cf1d188a2
Fix the Ephemeral guest mode UI bugs
...
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest
Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
2022-06-02 15:38:46 +00:00
Automerger Merge Worker
d4eda5e870
Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp am: 5a1b237f96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: I2168757d9bd2453f0aa8c4120684988bfdfc9485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:24:40 +00:00
TreeHugger Robot
345f36d6af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours am: f9c6f838d5
-s ours am: 1d65bf6b9d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ifd7e4a46a71c020c51fdd1fcd2c2cbb518337c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:23:58 +00:00
TreeHugger Robot
748d2f5687
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours am: bddc73bc19
-s ours am: 13135f12ff
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ia974ebdf8e88b692f8be13cb08958043df2a3247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:18:03 +00:00
Bill Yi
31e54e281c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours am: d2454198f5
-s ours am: dca279143c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ia3035084f2f06c79f999121ba9167eb962031eff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:17:42 +00:00
TreeHugger Robot
1053097efa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6
-s ours am: 37b8f2deeb
-s ours am: d44d813bfc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I7c925312412a0fe4af9bdabd4acb55dd7a6cb6f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:17:21 +00:00
Bill Yi
03345e7b86
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238
-s ours am: 048fedac8f
-s ours am: e11b1b89cc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I4e2f4b8922b5a9d15a3f2126487eb5c1201646d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 15:16:58 +00:00
Automerger Merge Worker
5a1b237f96
Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours am: f9c6f838d5
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours am: 3369ba127b
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6
-s ours am: f71bb3a8cb
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238
-s ours am: dfe3cc520b
-s ours
2022-06-02 14:46:17 +00:00
TreeHugger Robot
1d65bf6b9d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours am: f9c6f838d5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ia256a9927d8999fdc6b9dcd340eef40b5a4fda54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:45:52 +00:00
Bill Yi
5888a02f53
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours am: 3369ba127b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ida36c3c65b76ff9cf40a90bcf35668c48316e4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:45:28 +00:00
TreeHugger Robot
9acee87e9c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6
-s ours am: f71bb3a8cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I1af87a3970d0b1b5e61d1fad97a9efe99dec308d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:45:06 +00:00
Bill Yi
55e29911cf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238
-s ours am: dfe3cc520b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I9fd09a0d13cf77b7fbe0e7785be169d2e3b37d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:44:45 +00:00
TreeHugger Robot
13135f12ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours am: bddc73bc19
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: I2fd546c3324ebba588126fe6f5fbbf785bd77f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:44:24 +00:00
Bill Yi
dca279143c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours am: d2454198f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ib4f5ebc6cbeb7e156824af689858c269bba37ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:44:03 +00:00
TreeHugger Robot
d44d813bfc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6
-s ours am: 37b8f2deeb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I711a2740165b1ad3e75035858af87f01c2d0c396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:43:41 +00:00
Bill Yi
e11b1b89cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238
-s ours am: 048fedac8f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I4a625041d889694c3ca3d550877e612a67e31cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:43:17 +00:00
TreeHugger Robot
f9c6f838d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ib67c4c4f732d9af6389de9004a3ecf8266eea680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:32:04 +00:00
Bill Yi
3369ba127b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: I9193698072c95ce2939d1cdbbcab8cb46d174e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:31:38 +00:00
TreeHugger Robot
bddc73bc19
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: Ib11f0b22f8f564c8694eb45881c5bcacf6538342
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:31:22 +00:00
TreeHugger Robot
f71bb3a8cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693630
Change-Id: I10f381599969a86e316f77b9c38f87a940d09747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:31:16 +00:00
Bill Yi
d2454198f5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18693931
Change-Id: I81256a9b9656540f41a40b91d4164fd372b8cd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 14:31:05 +00:00