Yanting Yang
e2550c777a
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947
am: 8269df988f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167
Change-Id: Ifb661042222a49700a0eed8007f207cf1202647b
2021-09-27 03:24:06 +00:00
jasonwshsu
f03f6e2326
[automerger skipped] Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922
am: 91a147ff71
-s ours
...
am skip reason: Merged-In I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39 with SHA-1 2d3894a148
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915645
Change-Id: I04a7ef4a42b3c23d16e51084bc0fce8ee993810c
2021-09-27 03:24:01 +00:00
Yanting Yang
8269df988f
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev am: 2129ea5947
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895167
Change-Id: I70e9abf03d0985c7e327692a96b66fc731978b1f
2021-09-27 03:09:48 +00:00
jasonwshsu
91a147ff71
Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest am: 77dfb35922
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915645
Change-Id: Ibf00f3e9d071fe210f2b2f4aacd02c762f1121a9
2021-09-27 03:09:41 +00:00
Yanting Yang
2129ea5947
Merge "Fix crash of PictureInPictureDetailPreferenceController" into sc-v2-dev
2021-09-27 03:04:02 +00:00
jasonwshsu
77dfb35922
Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest
...
Root Cause: The lifecycle for
AccessibilityShortcutPreferenceFragmentTest did not be called correctly.
Solution:
* Call onAttach() before onCreate() to set some configs correctly, e.g.
FeatureFactory.
* Use ShadowFragment.class that we usually do in accessibility
tests.
Fix: 200906425
Fix: 201020915
Test: atest AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
Merged-In: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
2021-09-27 02:04:43 +00:00
jasonwshsu
2d3894a148
Fix failure test cases in AccessibilityShortcutPreferenceFragmentTest
...
Root Cause: The lifecycle for
AccessibilityShortcutPreferenceFragmentTest did not be called correctly.
Solution:
* Call onAttach() before onCreate() to some config, e.g.
FeatureFactory.
* Use ShadowFragment.class that we usually do in accessibility
tests.
Fix: 200906425
Fix: 201020915
Test: atest AccessibilityShortcutPreferenceFragmentTest
Change-Id: I3391c0a4a2c7c361a44c7d282b1d5d3e75a28a39
2021-09-26 03:16:57 +08:00
Bonian Chen
89abc263e0
Merge "[Settings] Enable kotlin language support"
2021-09-24 23:54:54 +00:00
Julia Reynolds
46d1d28ae6
Always return the same result code in access screens am: 1aff9c726a
am: e21284e8d9
am: eba8afd3e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133
Change-Id: I62c0fb6dce6e2d7d0254868cabe009d5acf4a4fb
2021-09-24 20:02:07 +00:00
Julia Reynolds
eba8afd3e6
Always return the same result code in access screens am: 1aff9c726a
am: e21284e8d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133
Change-Id: I264b8cb65037681c6e48f5435e5da6a590207dc3
2021-09-24 19:49:33 +00:00
Julia Reynolds
e21284e8d9
Always return the same result code in access screens am: 1aff9c726a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15908133
Change-Id: Ib1df91f97e9dd60cf13871db1eef62e4180d7e95
2021-09-24 19:35:14 +00:00
Bill Yi
f60ba12e3a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: d40bcd0e00
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898508
Change-Id: I8699e6acc077403a91de908c904d69a8a4f69762
2021-09-24 19:00:37 +00:00
Bill Yi
e76b048986
Merge changes from topic "presubmit-am-2e911009bb20437f88021e323ead1dab"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d74f4b3d
Import translations. DO NOT MERGE ANYWHERE
2021-09-24 18:45:12 +00:00
Bill Yi
d40bcd0e00
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-09-24 18:45:12 +00:00
Bill Yi
f33c6cb54e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: b01a8ddd0f
-s ours am: 1b275d9c03
-s ours am: 4d4867a662
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ib9b64f4381fb31a5b25747968f50695e89318f13
2021-09-24 18:30:39 +00:00
Bill Yi
285e30a8eb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: 17eccfd048
-s ours am: c6fad452b9
-s ours am: bfc00fd27f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Iea09c767493f0bc09a664d04bd5a4461d93e207f
2021-09-24 18:30:33 +00:00
Bill Yi
3b1879c08a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: 7e253fafe9
-s ours am: b61ad9bd03
-s ours am: 4d6fcaaf8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I6106504d2598df7bd18d4c2dfa7f0826b211dc1a
2021-09-24 18:30:15 +00:00
Bill Yi
6263362f6d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: ee7f088a94
-s ours am: ffc08e5492
-s ours am: a0f58ae81b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Id072be2d9ce2a4e07badb732275500d9416f7c61
2021-09-24 18:29:32 +00:00
Bill Yi
d1c7bb077a
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
am: 0522bb8e22
am: 813cd1750b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I393434a118480c218d8ab4f12430c0952f15412b
2021-09-24 18:28:54 +00:00
Bill Yi
c03ba19e0f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: c038db5354
-s ours am: fb5a956797
-s ours am: 6ccfefd14e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ifeb0216bacf0853c61a8a1d4bfdc901db463faac
2021-09-24 18:28:51 +00:00
Bill Yi
3e8e6ee696
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
am: fd934ec1ee
am: fee49424c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Ie333a3f85c1a5bb67fe83b8a90a19b548d7a7225
2021-09-24 18:26:21 +00:00
Bill Yi
0de7907b08
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: 3732defccb
-s ours am: ba80bd4ddd
-s ours am: fb0b9804dc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I6f19b8e6a49118759f1a88c6ddc0e9e46764994c
2021-09-24 18:26:18 +00:00
TreeHugger Robot
d901b27e28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 16ab663f53
-s ours am: f343c0e49a
-s ours am: b60e477794
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I74f7a98541a2e4f1ab495cc6974529a59e192a65
2021-09-24 18:20:09 +00:00
Bill Yi
41a2051ca0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: f78bbdeedc
-s ours am: cd039bb2de
-s ours am: 99781d9e65
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I4716f36bae34e2ec55dbb0cdf07cf6c0d8fc8784
2021-09-24 18:18:52 +00:00
Bill Yi
c889e4b444
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
am: 798e2adb59
am: 07ae1a8ba8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I6496cdd7ae77ea9b43c7798e2fa365040a5e60d9
2021-09-24 18:17:36 +00:00
Bill Yi
1fbcd17b8e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: 2175bf57c6
-s ours am: 27649a27e9
-s ours am: 7bfa6852da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I59adb4fb444c42129c32029438aaeb302e8f3509
2021-09-24 18:17:35 +00:00
Bill Yi
3f5ceb9602
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
am: b8dff25882
am: 2ae1d2c280
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: If11fb20eda2714ad8b58fb7833edffb9f48d11f4
2021-09-24 18:11:42 +00:00
Bill Yi
6c4cdf960c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: fab8681446
-s ours am: 767ce7ca1b
-s ours am: 4ecb61728b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I4e6329ca20cf7578d99286fed9b215eb4e3d61c4
2021-09-24 18:11:37 +00:00
TreeHugger Robot
24f84bbe2d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 58a441f611
-s ours am: df6573b91e
-s ours am: ac35cacba3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: If8ee7bb6b90949a0ce7a0c72ef972c9435488363
2021-09-24 18:09:44 +00:00
Bill Yi
0a1f42887b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: 7f395f18b2
-s ours am: e2bf04f17b
-s ours am: fa58f95b39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I0ec6dba96225d54a36c6d09b4d1393cd522039c3
2021-09-24 18:06:49 +00:00
Julia Reynolds
1aff9c726a
Always return the same result code in access screens
...
Regardless if the target package exists or not.
Test: Launch dnd and NLS screen with valid and invalid
packages; ensure the result code is the same for both
Bug: 195412179
Change-Id: I1bacd54c2971afb3733ca2f1462bcaabaada300b
2021-09-24 18:05:27 +00:00
Bill Yi
4d4867a662
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: b01a8ddd0f
-s ours am: 1b275d9c03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Idd0caf7d1de7be93e9c168c113cb715248ed5d31
2021-09-24 17:44:27 +00:00
Bill Yi
bfc00fd27f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: 17eccfd048
-s ours am: c6fad452b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Ibffcbc4c4054a9e1e23023377fba0f1475cd1c0a
2021-09-24 17:44:24 +00:00
Bill Yi
4d6fcaaf8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: 7e253fafe9
-s ours am: b61ad9bd03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I5437a0926893887aff61f2ea07ce5d79bff30a39
2021-09-24 17:44:20 +00:00
Bill Yi
a0f58ae81b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: ee7f088a94
-s ours am: ffc08e5492
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Ib6778b32eec2a7a84295836a50565163c858de8e
2021-09-24 17:44:13 +00:00
Bill Yi
813cd1750b
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
am: 0522bb8e22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ic4f6585b012b3331669ff3e4cc5186c6ef17b8df
2021-09-24 17:44:02 +00:00
Bill Yi
6ccfefd14e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: c038db5354
-s ours am: fb5a956797
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: If71c4795b3fd0ff132a0397b43e557b072231d16
2021-09-24 17:44:01 +00:00
Bill Yi
fee49424c3
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
am: fd934ec1ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Iadf21ef6f79fd01b045be79f80c72b2d2f667dec
2021-09-24 17:43:55 +00:00
Bill Yi
fb0b9804dc
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: 3732defccb
-s ours am: ba80bd4ddd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I0c204e6b9465ab39cfacbee9c81f1038b7bea0a1
2021-09-24 17:43:54 +00:00
TreeHugger Robot
b60e477794
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 16ab663f53
-s ours am: f343c0e49a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I40aecbde5b554bee851f6b071e1e4ef030f20b0d
2021-09-24 17:43:35 +00:00
Bill Yi
99781d9e65
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: f78bbdeedc
-s ours am: cd039bb2de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: I2f8999bfa8c83799963498921b5989d2b9c9996c
2021-09-24 17:43:15 +00:00
Bill Yi
07ae1a8ba8
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
am: 798e2adb59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I2b9f4dbbbd184b07a7f0f7b65b3b93d6dfc5fda0
2021-09-24 17:42:51 +00:00
Bill Yi
7bfa6852da
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: 2175bf57c6
-s ours am: 27649a27e9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: If32b06ccf546af0c8d7a949e1f83d71d729eda1c
2021-09-24 17:42:51 +00:00
Bill Yi
2ae1d2c280
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
am: b8dff25882
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I599d306dae2bcfe7491d6eebea1fcc549c27f4b2
2021-09-24 17:42:21 +00:00
Bill Yi
4ecb61728b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: fab8681446
-s ours am: 767ce7ca1b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I6689a3dea7282941fad720dc81bf3ace2c8370a5
2021-09-24 17:42:20 +00:00
TreeHugger Robot
ac35cacba3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 416206347b
-s ours am: 85214e918e
-s ours am: 58a441f611
-s ours am: df6573b91e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I1ecde33522c685e17a25a81f30ef1d2336473e50
2021-09-24 17:41:43 +00:00
Bill Yi
fa58f95b39
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: 7f395f18b2
-s ours am: e2bf04f17b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898483
Change-Id: Ia56b84d5c9de7acef48ab0566d937a421d5b4804
2021-09-24 17:41:15 +00:00
Bill Yi
1b275d9c03
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: b01a8ddd0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I0648a5c7d6537c0900f73ffc0596edee64f44cf8
2021-09-24 17:36:02 +00:00
Bill Yi
c6fad452b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: 17eccfd048
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Ia461e950dae6bc932070531c0eb1f462de3b8afd
2021-09-24 17:35:35 +00:00
Bill Yi
b61ad9bd03
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-s ours am: 7e253fafe9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ic936e269458a6c450bf3efe2710d376196ed24a0
2021-09-24 17:28:34 +00:00