PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,723 Commits 1 Branch 0 Tags
cf210dd00b486ffb074fe685573cba28923e5d6c
Commit Graph

104723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
55dc052eeb 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: I4a432c7345688490508a21e898462613baf1cd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:52:46 +00:00
Menghan Li
f2bfd08570 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: I940f854a1b6418b9f7d1f7fbb3c32bf1cea1235d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 09:52:06 +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
Josh Hou
0da6e0adc9 [automerge] [Panlingual] Screen title is displayed incorrectly 2p: 98490cc740 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Bug: 227285277
Change-Id: I3db0b36a5a5c329ecd147a91ee4f8b89df76d955
 2022-04-07 06:13:29 +00:00
Josh Hou
98490cc740 [Panlingual] Screen title is displayed incorrectly 
Fix the issue that the screen title name of the app language page is displayed incorrectly

Bug: 227285277
Test: Verify the issue by testing between the system language and app
language page

Change-Id: I5dbb10763bd5cc346bff9c270b14b945eb499273
 2022-04-07 14:02:22 +08: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
Presubmit Automerger Backend
b2b0822ee9 [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 2p: e1705a25b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Bug: 203168097
Change-Id: I6be138b4f338e0e3a8c255e4a3d2d02bfb23253b
 2022-04-07 04:08:28 +00:00
Presubmit Automerger Backend
e1705a25b4 [automerge] Restrict Wi-Fi toggle in Internet Settings 2p: 22c8bf81e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Bug: 203168097
Change-Id: I461037a25eddce597752cc085a8f9ef3942a2767
 2022-04-07 04:08:20 +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
4829301a97 [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: 5a78d70376 -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: I0a3fa60a9529869bef4545c9a1e78f4fe5237be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:55:03 +00:00
Tom Hsu
edb2110c9b Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 am: e82ca817a1 am: 5f6351588e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: I7f5ee4fc83005a119c63cd3faa1c0ba83669bec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:54:29 +00:00
Arc Wang
c4121c15e4 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:44:12 +00:00
Arc Wang
d10662cf97 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:42:30 +00:00
Arc Wang
c55b5b54d2 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:42:02 +00:00
Arc Wang
abf3369340 [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096

Bug: 181962311
Change-Id: Ic87c5c0052ae76f4b5a689a34768e678210c64b0
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:37 +00:00
Arc Wang
3357f3071a [automerge] Hide non-system overlay window on ActivityPicker 2p: d0a23dc840 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628096

Bug: 181962311
Change-Id: Ia1f3c9944e2ef886366719b754c89e7c4d99478a
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:36 +00:00
Arc Wang
d0a23dc840 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:38:24 +00:00
Arc Wang
1c8edd20a3 [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628095

Bug: 181962311
Change-Id: I7f99b94832948db188ddd45fd5e2a87ebc28af6f
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 03:35:48 +00:00
Arc Wang
b95bd5b449 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
Merged-In: I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3
 2022-04-07 11:33:54 +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
56ce938357 [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: afbae7aa88 -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: I34853eee0a2523abd2cb004a7d04a00146e5aa00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:24:17 +00:00
Tom Hsu
29b9eba2ac Merge "[Panlingual] Fix the back button press" into tm-dev am: a9d7aae694 am: a070470d59 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: I0522297e3f1ae971fa692c0706ba9f82f6d7aec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:23:55 +00:00
Arc Wang
2315d0f20e [automerge] Hide non-system overlay window on ActivityPicker 2p: 877a41b054 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628091

Bug: 181962311
Change-Id: Ia9438766ed1f6651b52f6e604a243d2be433eb45
 2022-04-07 03:20:31 +00:00
Bonian Chen
2ceea6e916 [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: 86a4d78651 -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: I9e6013ae14afdfb7da7a1ab4eeeb41f3acc4dbbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:17:14 +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
afbae7aa88 [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: I7d02351db2810eb8c9a8273f90796b8c13c43b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:09:52 +00:00
Tom Hsu
a070470d59 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: I3fdb718d576e205aa43fa0c63f11b270bd0d2a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:09:47 +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
Tom Hsu
27b82ddc9b Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod am: 94b0789323 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Change-Id: I94465169345e13cc62c5eeb2109a9bf989c18cb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:04:03 +00:00
Bonian Chen
39750f6695 [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: 9c11a15f75 -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: I7d0f4f73330073e977d29c8de106c767840c9dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 03:03:50 +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
Tom Hsu
94b0789323 Merge changes from topic "presubmit-am-f6b1787fd0f3424db0a7a4bb5c8bd472" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3
  [Panlingual] Fix the back button press
 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
9c11a15f75 [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: Ie1b6b953e57a49c787ae3c3744ea5f2889aae2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:41:52 +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
ea00d1ae28 [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: 6f757e5204 -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: I9c8bcc85da3e569f3c0546b850d6fafd97590239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:14 +00:00
Bonian Chen
7c3fd8d8df [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: 95218d221f -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: I6ebb1997c8631c61ef7d6d8509869dec215cddf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:13 +00:00
Bonian Chen
09c6dc24e0 [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: 0e47b74210 -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: I359859195e7f71fc075ceb179d6952b005183d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:04:00 +00:00
Bonian Chen
c570e0aedb [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: b7cdad31fe -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: I03cbc45d4151c2baaef55c49f8edaa21e880d9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:59 +00:00
Bonian Chen
6427f9884a [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: 711eae4650 -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: I6d72469e54395a24e5cbae6c8705982d2c49dd7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:48 +00:00
Bonian Chen
f036407298 [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: ead0035784 -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: I2398c6aee6c4896768255ce033ac3ef5b8a3d166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:47 +00:00
Bonian Chen
7ce982d710 [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: 0b8c2ad714 -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: I9bc24737b185c8cffda6d7938f85e01046fb8e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 02:03:36 +00:00