PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,405 Commits 1 Branch 0 Tags
10b4940a2ec20cf1adff38538e74545daf828c0d
Commit Graph

101405 Commits

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

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

Change-Id: I7171f6e0493773705bff5ccabac56d8bb6ecbec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:25:29 +00:00
TreeHugger Robot
9e81a99857 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 8e9c30933a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd5fc4a5daedab1839b13153caf395ed8643fb32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:46 +00:00
Bill Yi
90f845a535 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08321b4e75 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic549f6d8e099580d27740f838fe9a998ac75aa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 17:24:42 +00:00
TreeHugger Robot
8e9c30933a Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-07 17:00:05 +00:00
TreeHugger Robot
aa240f4299 Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d am: e406597fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I7647536f6b08d202aeee5136d4f5ad2c701250f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 12:09:44 +00:00
TreeHugger Robot
e406597fe2 Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I2b91d4ac1320ce79037c073f913800f0f0ca785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 11:54:52 +00:00
TreeHugger Robot
59c849da4d Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev 2022-04-07 11:47:51 +00:00
Edgar Wang
ee2934072b Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af am: 4bd3057db3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526

Change-Id: Iba1cfcb3eaa38f724535989c522bb56d777baa11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 10:32:19 +00:00
TreeHugger Robot
2181b9ccbf Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c am: 739b57cf0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: I629e7d500dd52bc7c3995d00c624829e54be3f47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 10:32:04 +00:00
Menghan Li
32c12991d0 Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141 am: e7ab9f38cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083

Change-Id: I730d63469054a69735a0aa3d60fe9a223f867247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 10:31:42 +00:00
Edgar Wang
4bd3057db3 Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev am: e27296e7af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539526

Change-Id: I4108bcb152acbec025978c294761b0411b78f572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:55:50 +00:00
TreeHugger Robot
739b57cf0e Merge "Hide non-system overlay window on ActivityPicker" into tm-dev am: 746502e98c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Change-Id: Ieebd00482a3532bae1b12546b2ec45d2dc9300ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:55:33 +00:00
Menghan Li
e7ab9f38cf Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev am: b62b37b141 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628083

Change-Id: I82e22e6cea7c46cf0da52fd0977a74cee7f6de85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:54:55 +00:00
Edgar Wang
e27296e7af Merge "Update Spinner style of Print Settings to apply MN style" into tm-dev 2022-04-07 08:01:57 +00:00
TreeHugger Robot
746502e98c Merge "Hide non-system overlay window on ActivityPicker" into tm-dev 2022-04-07 06:51:35 +00:00
Menghan Li
b62b37b141 Merge "Avoid accessibility pages display on notification bar in setup" into tm-dev 2022-04-07 06:51:19 +00:00
menghanli
7280add032 Avoid accessibility pages display on notification bar in setup 
Root cause: ag/7505195 introduce to set clipToPadding false on scrollView to make it extend below navbar to overlaps with sibling views. In this case anything pinned on top of screen (switchbar, pinned header for most UIs, and preview indicator for font size page).So, the recycler draw content outside of its bounds.
Solution: Defines whether a child is limited to draw inside of its bounds and the ViewGroup will clip its drawing surface so as to exclude the padding area for SuW flow.

Bug: 227349626
Bug: 227409455
Bug: 222022439
Test: Manual testing
Change-Id: I439508c8e8c90e7303a72a4990c7ef1b9e5bc19d
 2022-04-07 05:45:44 +00:00
Weng Su
22c8bf81e1 Restrict Wi-Fi toggle in Internet Settings 
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.

- Show restriction message in Wi-Fi toggle summary.

- See the result screenshot in b/203168097#comment24

Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest

Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
 2022-04-07 12:06:13 +08:00
Bonian Chen
5a78d70376 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours am: 59ecb81133 -s ours am: 5751635a03 -s ours am: c823a9e0a4 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I89ec4ac726f22f9ec5f1e94eb5283f2268224584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:31:35 +00:00
Tom Hsu
5f6351588e Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 am: e82ca817a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: Idfc3df7710c48cdfb63c0c7fca44fde52f4f25f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:31:30 +00:00
Bonian Chen
c823a9e0a4 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours am: 59ecb81133 -s ours am: 5751635a03 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: Iaa733eab6ba349d892ee0fb0d0265543a22eabe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:10:53 +00:00
Tom Hsu
e82ca817a1 Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: Id9675919d94a715e77c930f79ba5f471c467ba4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:10:44 +00:00
Bonian Chen
86a4d78651 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: a171ca8477 -s ours am: c5c5072587 -s ours am: 5bcd2f7fa5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I7e5e4149aafe0aabcb04477df8abd142c746ad81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:04:04 +00:00
Bonian Chen
5751635a03 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours am: 59ecb81133 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I9cfcc382d3ac00b1015517cf399c22e4f4802946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:02:17 +00:00
Tom Hsu
a9d7aae694 Merge "[Panlingual] Fix the back button press" into tm-dev 2022-04-07 02:52:23 +00:00
Bonian Chen
5bcd2f7fa5 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: a171ca8477 -s ours am: c5c5072587 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: If24a54c4e68cbeede4352be068af500e3116941e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:42:24 +00:00
Bonian Chen
59ecb81133 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours am: b834eacedb -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: Id708691389716abaa0424a6dfde3f685df297409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:40:27 +00:00
Arc Wang
877a41b054 Hide non-system overlay window on ActivityPicker 
To improve security.

Bug: 181962311
Test: manual
      Show an AlertDialog and observe if it will hide after below command.
      adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 10:39:13 +08:00
Bonian Chen
b834eacedb [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: 62694fefcb -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I34086ad2baee255f9413529edcfed89cdc95eb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:25:48 +00:00
Bonian Chen
c5c5072587 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours am: a171ca8477 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I8c700c4d502a8fded1048daedba5fb8098a53714
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:25:43 +00:00
Bonian Chen
62694fefcb [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I5097c99851620d39004d0b62f6479d4d71b46d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:06 +00:00
Bonian Chen
a171ca8477 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours am: ad3fef885f -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I5b13cb302d6d75a217428c05401ae52e6a9b1a81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:02:04 +00:00
Bonian Chen
6f757e5204 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: c058392a70 -s ours am: 06b9bf362e -s ours am: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours am: cbf8100332 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I81e9bf1cad045be5b016cdea442761cc036d9ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:31 +00:00
Bonian Chen
95218d221f [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -s ours am: f52fc37869 -s ours am: 0293401f09 -s ours am: aa208d9ad6 -s ours am: 76206644d1 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: If0d2115228f64ecc342c0de9d462a15841099dc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:30 +00:00
Bonian Chen
0e47b74210 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours am: b82af15ea9 -s ours am: da5f4be369 -s ours am: dcbe3315c2 -s ours am: 4a77355af6 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Ic47513fe0397738435fb796861ce123f803111de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:21 +00:00
Bonian Chen
b7cdad31fe [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: 83e4693075 -s ours am: 8f9ade3eaf -s ours am: 6e2a866bef -s ours am: f7d2fbdc88 -s ours am: 8012ed420f -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I8ef48e43b355b83aaabe723336f6e300f50fcb56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:20 +00:00
Bonian Chen
711eae4650 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 -s ours am: 771b606116 -s ours am: 7c93a31c72 -s ours am: c9f5c30e04 -s ours am: eab9c0baf9 -s ours am: 0973ccb0e7 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

Change-Id: I7b867e19d7b985a90b3c4b19550eb0b291893642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:12 +00:00
Bonian Chen
ead0035784 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5935cae639 -s ours am: 351e22f8e2 -s ours am: 79238cbd50 -s ours am: c613394e88 -s ours am: 596513cbc5 -s ours am: cc40b60988 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 96f581310f is already in history

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

Change-Id: I30d5960346f6416078fad99df3a378d16441cffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:11 +00:00
Bonian Chen
0b8c2ad714 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-qpr1-dev am: a84027d685 -s ours am: db51e0c04b -s ours am: ee79190be9 -s ours am: aa4b1c4087 -s ours am: 1b41873057 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: I9fa2857f5b574d4cff7eba8506a78562c8befc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:03 +00:00
Bonian Chen
d56011040a [automerger skipped] [Settings] Move display of VPN version into summary text am: 96f581310f -s ours am: 3c651042ba -s ours am: 5305cceda7 -s ours am: 353289122c -s ours am: 60ead8796f -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: I8c105d244b31aed8deb59b9a7530b1b8db1c1231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:42:03 +00:00
Bonian Chen
da5676d4ea [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: 2b767881d6 -s ours am: a6e2ce6e95 -s ours am: 6d6e40b5a5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I8dad18856662585afa3f5ba1487a050321aa365c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
5de1e4e244 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: 065876ee1b -s ours am: 275f38c554 -s ours am: bcfc0913fa -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Ie1768f6881c9bbbcd5ac6ef1a4e77b1cf26d12c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:55 +00:00
Bonian Chen
4cb8514e55 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: dad1ee3deb -s ours am: 0382c98491 -s ours am: 8254eaf6e5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: Idfc5967ada272fd13e147f3b59848cad2b4e39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:47 +00:00
Bonian Chen
bff0b04656 [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: b3be027c39 -s ours am: 663715de66 -s ours am: 62e59a727a -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: If6eed5dd6ed360ae1f8c0dec12d2a8c03b76f235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:46 +00:00
Bonian Chen
20a2d95a3c [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into sc-dev am: 0f10561082 am: 1893045740 -s ours am: fdc7764eff -s ours am: c95c6de8b5 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 14e76c3233 is already in history

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

Change-Id: I288019aa868663fcfe3b469630d6b949d616ce1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:41:39 +00:00
Bonian Chen
ad3fef885f [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into qt-dev am: d0888970a4 am: d35d3e2446 -s ours am: 961d4b26b7 -s ours am: 8c89ac9027 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 dddd74a491 is already in history

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

Change-Id: I912d9f1baa62559df394f95080fdde71ac91c318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:39:53 +00:00
Bonian Chen
cbf8100332 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-dev am: d0d67e68a5 -s ours am: e8097d4464 -s ours am: 35c5b0b0a2 -s ours am: c058392a70 -s ours am: 06b9bf362e -s ours am: 10dcc4bf9c -s ours am: 7a9fda2691 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: Idfbc390fa99709e2ab63eec941539afe7e1ff156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:18:33 +00:00
Bonian Chen
76206644d1 [automerger skipped] [Settings] Move display of VPN version into summary text am: dddd74a491 -s ours am: eefa7371ed -s ours am: fcdc4a4de3 -s ours am: b17f587257 -s ours am: f52fc37869 -s ours am: 0293401f09 -s ours am: aa208d9ad6 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5fc0e6614d is already in history

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

Change-Id: I93bc59c480504ba58eea649529add95ae9273842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:18:32 +00:00
Bonian Chen
4a77355af6 [automerger skipped] Merge "[Settings] Move display of VPN version into summary text" into rvc-qpr-dev am: 6279d80f93 -s ours am: d15869f014 -s ours am: eedfefab4b -s ours am: b82af15ea9 -s ours am: da5f4be369 -s ours am: dcbe3315c2 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I92b180576845533321b73321e7a9c7ee3d83169b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:18:24 +00:00
Bonian Chen
8012ed420f [automerger skipped] [Settings] Move display of VPN version into summary text am: 5fc0e6614d -s ours am: 96fe347312 -s ours am: 83e4693075 -s ours am: 8f9ade3eaf -s ours am: 6e2a866bef -s ours am: f7d2fbdc88 -s ours 
am skip reason: Merged-In I666b9db356feeebf04e3be688897c2d9110a5275 with SHA-1 5935cae639 is already in history

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

Change-Id: I439e1fe8af971e4b459729220353972000a38a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 01:18:23 +00:00