PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,003 Commits 1 Branch 0 Tags
acf90168d4dfbfd1ffe9811a891c04b388ec5baf
Commit Graph

109003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
acf90168d4 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 42704ba27c am: 739b6fd20d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Ibb4f49271398fb7bfeffaf9bf7d2b1f54761a902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:39:48 +00:00
Edgar Wang
78a3570a2e Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 2e995ee697 am: 0d56428610 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Ia80a105728699f80088c6898e06f16d0f188f512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:35:30 +00:00
Edgar Wang
8691006c5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998 am: b9a06a9f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I74b97b4b7d7a009af0dd20fe9f1a24717fffd3f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:28:03 +00:00
Edgar Wang
739b6fd20d Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 42704ba27c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I4fc4f187592b0f904f65cc892554371493e339ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:20:17 +00:00
Edgar Wang
0d56428610 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f am: 2e995ee697 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Ib1015a217770a3412ab914146686a5816162e40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:06:23 +00:00
Edgar Wang
b9a06a9f34 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c am: 21ddf79998 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I2f7ce317b7bb9d355fbb1e5f0fc2aacb1da7f8d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-21 00:02:22 +00:00
Edgar Wang
2e995ee697 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I8687407c4c7c99015bc38818b9a1beb681a3e1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:52:50 +00:00
Edgar Wang
42704ba27c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: 4d371adf7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I70547c9094cdd200f1fa2a77272affbcbe308a34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:52:43 +00:00
Edgar Wang
21ddf79998 Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 am: eaa0a1cf5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: If0fba8bf4c69645bf8cc6a153580ed7cda57610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:51:54 +00:00
Edgar Wang
4d371adf7f Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: Id0599efcfd1a61b12e4e759afb76259f14fdd5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:25:32 +00:00
Edgar Wang
eaa0a1cf5c Merge "Update learn more string of FooterPrefernce" into tm-dev am: 24654a3d61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356903

Change-Id: I10a24e8723d555c9bf81ee0efff9dea9d56bf736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 23:24:36 +00:00
Edgar Wang
24654a3d61 Merge "Update learn more string of FooterPrefernce" into tm-dev 2022-05-20 23:13:07 +00:00
TreeHugger Robot
4d55a08806 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 5416a4fd6e am: 682a02b687 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I8dbb9822715b7ced81f0a0522060c2f9602aa621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 20:20:29 +00:00
TreeHugger Robot
7f90fbdc79 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab am: ef922caf2e am: 658b54b03a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I6e4f47a356f69064e7462f17f8a8419e8407f260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 20:15:47 +00:00
TreeHugger Robot
5149074245 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0 am: 8734e549a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ibd6a252dcbbcf15b7cba7c3770876422c2b29827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 20:14:01 +00:00
TreeHugger Robot
682a02b687 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 5416a4fd6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Icdad28a060f07d8f72ecd223660c3cb69ece05ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:51 +00:00
TreeHugger Robot
658b54b03a Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab am: ef922caf2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I7b05ff873e5cb265f45fb5de899920298cb48e2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:32 +00:00
TreeHugger Robot
8734e549a0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 am: 12cc3aeae0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ib2aafb5ccca14534c30a6d3b555bc9fdec8e9879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:54:16 +00:00
TreeHugger Robot
5416a4fd6e Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I0c68a4f31552bff5a134c52e86dda61dcc000e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:33:53 +00:00
TreeHugger Robot
12cc3aeae0 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: f36d767679 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I468f2cce8f5d67055addc01ef4749b1cf98b5896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:33:43 +00:00
TreeHugger Robot
ef922caf2e Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 am: 96d31478ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I72bbadfe8be1d2710704dc5c85d54c0d7d6ff6f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:24:51 +00:00
TreeHugger Robot
f36d767679 Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: I2a4e530320564961901f96af333e47dd019aa226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 19:14:12 +00:00
TreeHugger Robot
96d31478ab Merge "Filter out the duplicate click event on menu page" into tm-dev am: baa2c48575 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486285

Change-Id: Ife6c05fc69d672a15d1bbbb8e06ba87e2f3a3ef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 18:58:15 +00:00
TreeHugger Robot
baa2c48575 Merge "Filter out the duplicate click event on menu page" into tm-dev 2022-05-20 18:18:58 +00:00
Hank Sheng
b08aa8ea78 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 3935ea32fd am: 96b8ee8b2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: If39f8967dd889a7e3cd3e239de80a866a412fe0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:50:47 +00:00
Hank Sheng
95dca1e031 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce am: 033a744c95 am: a64a7640ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I0570d6efa2cd98a3d180c98279f044322dfc5691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:50:37 +00:00
Hank Sheng
f01376e612 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376 am: ac59647901 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I1275208f464e76aa24d6058620fb271f02c80c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:49:13 +00:00
Hank Sheng
96b8ee8b2e Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 3935ea32fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I59bb6be1f33846b51a6752c1c63905da6f58408b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:23:36 +00:00
Hank Sheng
a64a7640ff Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce am: 033a744c95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Ia2a268a3d266a8c91149086a493b63d1565da622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:23:17 +00:00
Hank Sheng
ac59647901 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 am: 9fb34ae376 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Ib2ecd69665ad7e35c7f8c15823388e9ad75d721f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:22:38 +00:00
Hank Sheng
3935ea32fd Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I3c8a6a744c33d87f976536717d8d49f3bbf59ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:56 +00:00
Hank Sheng
033a744c95 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 434e728bce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: Iac318ff0b836ac2148c1c08f28298655f8596fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:50 +00:00
Hank Sheng
9fb34ae376 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b am: 37c36d0c63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I4aa2af07a568f4a67e47d52959f74004f4c8990c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 17:06:48 +00:00
Hank Sheng
37c36d0c63 Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I155d06cf2e6c0adf93426d35075b8ebeb71b84be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:49:13 +00:00
Hank Sheng
434e728bce Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev am: 841964c02b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18492029

Change-Id: I11fd085f1798f2ebaab2b14951716038379e2848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:47:41 +00:00
Hank Sheng
841964c02b Merge "Apply the glifv3 theme when the theme string in intentExtra is glifv4." into tm-dev 2022-05-20 16:27:56 +00:00
Jason Chiu
e04dfaa29e Filter out the duplicate click event on menu page 
Whenever the highlighted item is clicked, Settings shouldn't start the
second-layer page again even if the user goes to its child page.
Ex. When the user goes to the Tethering page, clicking on the menu
entry "Network & Internet" should not switch to the page.

Exception: in the deep link case, allow the first click event on the
highlighted item to launch the second-layer page when the page is not
the same as the one on the right pane.

Fix: 215267159
Test: manual, robotest
Change-Id: I2315e0069facc4867cb157752b1a3144716b7d17
 2022-05-20 15:01:31 +00:00
TreeHugger Robot
25b832f061 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 6a2136b93a am: 19911706d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I09d0dece1ac8e871fd4c24dac8e5a45e6d45a535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:32:36 +00:00
TreeHugger Robot
0e6a0612e5 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 7a8d582874 am: 5ca6f95d91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: Ice3925bfc26b001941dbf30fd180dc464568ce5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:23:48 +00:00
TreeHugger Robot
ec38f3aaf5 Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: fdc8f75278 am: 776ef7ce34 am: df5f2618ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I3a4752176c193290ea14f95d5f483b5cae615b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:03:01 +00:00
TreeHugger Robot
e343b177db Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: 6ecbc57e0e am: a0470d433c am: 74d16a3f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: Id8d491ae8e0e853e7f50a29ef7f367f3a99c57d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:01:48 +00:00
Chaohui Wang
6ca3c2fa9c Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: 246764009c am: 5e09274023 am: 9f8b8b376d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I56e50888a4352068271aaaead61e17bc7ceb10d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 14:00:23 +00:00
TreeHugger Robot
596556e6a8 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 972bb9ddef am: 4bc2f2df60 am: 50250ad224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: I8064841445a7e26ccf691bde21b9882347d5e65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:57:13 +00:00
SongFerngWang
f3cac7c8b7 The settings crash when it add the RTL mark on MEP message am: 7de5f99847 am: eae57aee2e am: d46f1f8afe am: 3ece44d658 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482929

Change-Id: I9733fbbbcfc5be6043ff6202daba2cfcce982b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:57:05 +00:00
TreeHugger Robot
9701c991ee Merge "Revert "Show previous query upon configuration change"" into tm-dev am: fea570f524 am: 4ffd6caf54 am: 420b448fd1 am: 8329fa64cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18486386

Change-Id: I0f7a0d1c0e8e69bf0849fc3105c15018a05d6449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:56:58 +00:00
TreeHugger Robot
00ef8da5f4 Merge "Show mobile data icon with carrier Wi-Fi level in Settings" into tm-dev am: f16c90f91d am: dd1ad333a8 am: 2b09ae4f4e am: facd82dd9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18467044

Change-Id: I897e405bb5874ec8d3f956d9bf312a3e8c924f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:55:49 +00:00
Calvin Pan
5b62cb1224 Merge "Avoid getting app locale config for each app" into tm-dev am: 9d6cf4255d am: 977c6316a8 am: a33cc3f07a am: b2cfdba385 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18456663

Change-Id: I0b9c57f8afdb9faf5061f8da7c1bd980fb05cf19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:51:24 +00:00
Chaohui Wang
93caad3b02 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: 29a1747a91 am: f5ca0131eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I9c3b5851e7217a9fb2a5c296eeb47dcc85e6d0b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:46:12 +00:00
Chaohui Wang
2cf9780748 Merge "Add the jank detection to Settings toggles" into tm-dev am: a47f9bb17f am: ca86110548 am: c41f9a953a am: 0f1658d013 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18212942

Change-Id: I298b0de2dcfe6a914cb74bc9947bd5780a48cca5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:44:18 +00:00
TreeHugger Robot
f36aed9286 Merge "Fix the work profile's deep link problem" into tm-dev am: 2b9dd10fa5 am: 9bfff8cb94 am: bcc628c7f3 am: 4b42121489 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18482928

Change-Id: Iea278e869233204caa9fbeeefa9103a05e18eec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 13:30:35 +00:00