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

104676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
e4d9c56c01 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: d65f4f645e -s ours am: 57775ce240 -s ours am: e55a9cd9b1 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I5aaedb164e9524a7aabebed1ee6982538ef66c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:56:47 +00:00
Arc Wang
e01b67b83a [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: d65f4f645e -s ours am: 57775ce240 -s ours am: 71c58ae18a -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I6202f601db79cfb03151d06862f432197a3bc804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:56:43 +00:00
Arc Wang
b4fe527f77 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 37a290bf79 -s ours am: ef9d2a4f94 -s ours am: 6f811dcce3 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I4d83c3a53e497e08bdc5f65cf480e62acf69a073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:54:30 +00:00
Arc Wang
d6ddc73255 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 37a290bf79 -s ours am: ef9d2a4f94 -s ours am: 433d14e39d -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I1f2408bda8a48e6aee476e482376e87c6a062733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:52:20 +00:00
Arc Wang
f3b8833975 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: 4433b23ba9 -s ours am: 7b2c130b51 -s ours am: 581c11eafe -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Id1b8f767211c889f693e1ab11f4108a12d76bbeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:50:59 +00:00
Arc Wang
0f645292f7 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 4f2a4c2036 -s ours am: 561bb2f83e -s ours am: 77db4bf946 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Ibb843392f3a8d0ce54a8466d41274dded1aca9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 22:50:36 +00:00
Weng Su
a0e05a271d [automerge] Fix unexpected Wi-Fi hotspot shutdown 2p: 6c42636cb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Bug: 227719584
Change-Id: Icc8a154a06170a321c848578797c6a8c823cc845
 2022-04-07 21:37:05 +00:00
Weng Su
6c42636cb8 Fix unexpected Wi-Fi hotspot shutdown 
- Filter out unnecessary onSwitchChanged callbacks when the switch is
  disabled, which should not be triggered by user input.

- Refine the state handling function to avoid unnecessary
  onSwitchChanged callback.

- Refine the error handling of isHotspotPasswordValid function.

Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
 2022-04-08 05:35:14 +08:00
Arc Wang
e55a9cd9b1 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: d65f4f645e -s ours am: 57775ce240 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I4097068aa905bd7c5298f43540acc5c7a22a49bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:17:55 +00:00
Arc Wang
71c58ae18a [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: d65f4f645e -s ours am: 57775ce240 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I75c6d208b9a01b71788a8f17af3a849b3b7393c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:16:59 +00:00
Arc Wang
6f811dcce3 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 37a290bf79 -s ours am: ef9d2a4f94 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Iebdf3fb9f337ebb344c2899fcb04175d65ac93e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:16:50 +00:00
Arc Wang
433d14e39d [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 37a290bf79 -s ours am: ef9d2a4f94 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Ic34607fa6cac449b7da2f2c1ed6ebdfbfd74c9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:15:32 +00:00
Arc Wang
581c11eafe [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: 4433b23ba9 -s ours am: 7b2c130b51 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I58aad30729443e148da154a0d1125a6e8cb8c9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:13:47 +00:00
Arc Wang
77db4bf946 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 4f2a4c2036 -s ours am: 561bb2f83e -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Iba131858c4965835bf5ea7636cd66f6533d02510
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:13:39 +00:00
Arc Wang
57775ce240 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: d65f4f645e -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I303929daf01447a7d0d9ce371c2370c0f6957b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 21:00:26 +00:00
Arc Wang
ef9d2a4f94 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 37a290bf79 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I812ea91050bd00e0b0a4ab9ffde6c6bba5ca5e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:59:45 +00:00
Arc Wang
7b2c130b51 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours am: 4433b23ba9 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Ib63653a11e9874c656bd2dd997f67a2b59d2788c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:59:13 +00:00
Arc Wang
561bb2f83e [automerger skipped] Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 am: 4f2a4c2036 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: Id6964b2ad98a10ec99d77d3fc08887affa204340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:59:06 +00:00
TreeHugger Robot
b744cc0bac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours am: ec6d0cc375 -s ours am: dae05a94c6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8370a406c71c01849b6df392ce9c893a1c84dc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:35:05 +00:00
Arc Wang
4433b23ba9 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: Iad907d4b02e7e2406aca918d8841d21aceab12e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:33:34 +00:00
Arc Wang
4f2a4c2036 Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098

Change-Id: I385f1718bdc0810db374edff607a5d088caffa52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:33:29 +00:00
Arc Wang
d65f4f645e [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours am: 038da819d2 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I30b031e36a6553930faec328c2d0097e426fb8b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:41 +00:00
Arc Wang
37a290bf79 Hide non-system overlay window on ActivityPicker am: c55b5b54d2 am: fcf0584f93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098

Change-Id: I1828afe6ae782b7165d17b7c3f721ffc52c9f7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:35 +00:00
Arc Wang
038da819d2 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours am: 346ab35fc4 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: I705269b27f44fd7335013ff728113a12f088bc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:32:16 +00:00
TreeHugger Robot
dae05a94c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours am: ec6d0cc375 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8bd4ab5ed5c5ce12cdd9033b7400fc13e3a6844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:07:21 +00:00
TreeHugger Robot
5e683614c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours am: fcb4079f15 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iafdd664b3ad846c8b2fe2939334586add53682ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:06:47 +00:00
Arc Wang
346ab35fc4 [automerger skipped] Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 am: e5e271bfed -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 c55b5b54d2 is already in history

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

Change-Id: If996f3775f8de7981af3409129d8d5254b470b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 20:05:45 +00:00
Arc Wang
fcf0584f93 Hide non-system overlay window on ActivityPicker am: c55b5b54d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628098

Change-Id: I5404085011ef8f1120e0a8239e4049d617716690
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:59:23 +00:00
TreeHugger Robot
ec6d0cc375 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8cc11dce1ac425df2ee58b22ea3f59c8ad4f2c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:46:28 +00:00
TreeHugger Robot
fcb4079f15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5713b2d3671ed905a7174d5cd241d7440335ca63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:45:10 +00:00
TreeHugger Robot
775739c7b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 11c23a6a04 -s ours am: 640cbd98af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12ae03b14c915a3575b0046932852aa9acca0835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:40 +00:00
Bill Yi
9230fb03d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e -s ours am: 2569970104 -s ours am: edd538585e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6339d92bdbd3aaddc4abc7b244eaa65bbd259ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:39 +00:00
Arc Wang
e5e271bfed Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100

Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:36 +00:00
TreeHugger Robot
4097859218 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229 am: 4ec4191709 am: 8bbcb0d5e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: I76c90f866f97e85eb57c0597b12b4e92bbecfa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:31 +00:00
Bill Yi
530add3543 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b am: d0019169fc -s ours am: 1e61214e45 -s ours am: 5a2f516216 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb5789d9ef2c076467d3b2b5cbc5c4efd374eaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:29 +00:00
TreeHugger Robot
11522c0e71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours am: bba674ffe1 -s ours am: 9afb293be5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I85c1783747c8cf5736fbc51f0229f65e60f67f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:08 +00:00
Bill Yi
4a66d8fb5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50 -s ours am: f3020bd56f -s ours am: 65c8955fc9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d29409c537a3ee901f5ced3cb7f4a645f747230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:44:07 +00:00
TreeHugger Robot
76c09d598c [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours am: 49ad55503b -s ours am: fcbf430ef7 -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I44227494860c6edbc6962a7a75dabcc292d26ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:42:58 +00:00
TreeHugger Robot
640cbd98af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 11c23a6a04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If261538d1759fec1982c07d77843d8973d1ca67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:39:45 +00:00
Bill Yi
edd538585e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e -s ours am: 2569970104 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I713bbd9b3c311149ef14bc95ce7d0abb57e1e781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:39:43 +00:00
TreeHugger Robot
8a4255e700 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 061cd8506b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdfafff67270bf11b49139dff33b09adec208ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:38:47 +00:00
TreeHugger Robot
fef3c04623 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 4ce39c1441 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf3feeb9a870a42a14874569ca6fd2123c7009c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:38:31 +00:00
TreeHugger Robot
61e32ec358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9db56c5336 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5724864d24977c70bae94a6d57c72bcf38ed742d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:38:15 +00:00
TreeHugger Robot
d694708421 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I03bd28da190f8a10e88f4226a12eef69d9d1f5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:37:57 +00:00
Automerger Merge Worker
04b90f6b12 Merge "Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod am: e2a9ecd37f" 2022-04-07 19:37:38 +00:00
TreeHugger Robot
c127628371 Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod am: e2a9ecd37f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450

Change-Id: I5a986c89506c8c814a33099f61e26182812d36d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:37:36 +00:00
Arc Wang
5c314ba8a9 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours am: 0c2193a8f2 -s ours am: 572b1c900f -s ours 
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I110485ebba53cb72fcdad56b4b4e72b8d49b778c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-07 19:37:34 +00:00
TreeHugger Robot
061cd8506b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 19:25:51 +00:00
TreeHugger Robot
cc3f700218 Merge changes from topic "presubmit-am-d9be502146b44984909a37c7880a2a47" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f2c568bba1
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-07 19:25:51 +00:00
TreeHugger Robot
11c23a6a04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours 
am skip reason: subject contains skip directive

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

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