Bill Yi
1935982f0c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915622
Change-Id: I0cefaafdf0478a4c4d6cb92ace0e14c2d5cea3b2
2021-09-27 07:05:26 +00:00
TreeHugger Robot
33e5bdd34d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-27 06:52:41 +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
Daniel Solomon
5a02e48902
Update BrightnessInfo constructor usage
...
Bug: 200851199
Test: atest DisplayModeDirectorTest BrightnessLevelPreferenceControllerTest
Change-Id: I37593443b3d7eb314f8c4970711e4d4d6f39c6ea
2021-09-26 16:14:09 -07:00
Bill Yi
b28191e3c0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7b2a0c1b711f75dfd5dd0f89cbf0cd5776bc5cc
2021-09-26 04:42:16 +00:00
Bill Yi
49ce6473d6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7c1879f0724a02c587b898e68ef9161871561431
2021-09-26 04:38:29 +00:00
Bill Yi
7245d9f02a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I8aef99f96568cb302d895a18e5a1806da044701f
2021-09-26 04:35:06 +00:00
Bill Yi
fe3544e435
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ib81043858abd402fcc9e4b0cdfa856ca2a26b3ba
2021-09-26 04:35:06 +00:00
Bill Yi
92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I116288a1e6ca78f8cd87f40b7a83de262b7b4449
2021-09-26 04:34:53 +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
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
Bill Yi
ffc08e5492
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-s ours am: ee7f088a94
-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: If817910e5df391007d014318015636c1fa405730
2021-09-24 17:28:28 +00:00
Bill Yi
0522bb8e22
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-qpr1-dev am: 1b857d20ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: I4017c631e26ecd89579e86313d1bff14e7d5ff00
2021-09-24 17:28:25 +00:00
Bill Yi
fb5a956797
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: c038db5354
-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: I2927ae3d99e3e899899a4b591731dd54f0b90596
2021-09-24 17:28:24 +00:00
Bill Yi
fd934ec1ee
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-qpr1-dev am: 6553465417
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: Ieae6cde28894b935da0e437f8279478ebc6f3c06
2021-09-24 17:28:07 +00:00
Bill Yi
ba80bd4ddd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: 3732defccb
-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: Icf1ced8676e9b8d08a812dd7e67bb4d14a1565f0
2021-09-24 17:28:04 +00:00
TreeHugger Robot
f343c0e49a
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: Ic7d79aacc898a4b86c34df1f0e8e58edb1446e84
2021-09-24 17:27:37 +00:00
Bill Yi
7e253fafe9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-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: I2820410fc0de20dd6ec3b8fe2bb92dc593b6b3e7
2021-09-24 17:27:21 +00:00
Bill Yi
ee7f088a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-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: Id9ce6f1b5106c79de410fa563465ee026c1a17f2
2021-09-24 17:26:39 +00:00
Bill Yi
cd039bb2de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 20df40e783
-s ours am: 78abb83343
-s ours am: f78bbdeedc
-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: I3a9d81bd7af985a14c1ac756775b6ffaf0a03a0b
2021-09-24 17:26:16 +00:00
Bill Yi
b01a8ddd0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d43653e80d
-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: I1b040c3b7f9c49990ca50381233325f96db54357
2021-09-24 17:25:53 +00:00
Bill Yi
17eccfd048
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ffa2c65c22
-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: I9ac01c58e94e4bc8e8a03400112049bc06cf0c01
2021-09-24 17:25:28 +00:00
Bill Yi
798e2adb59
Merge changes from topic "presubmit-am-53ab77861524469e9de71f3ed0f3399c" into sc-dev-plus-aosp am: 93e7956a7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898513
Change-Id: Ib1965639952ad39d8c94229b0c02b94f996ea688
2021-09-24 17:15:20 +00:00
Bill Yi
27649a27e9
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 464f75c26f
am: 2175bf57c6
-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: Id1d9ce2eaa7b8a59362e88c53c4ccf3b84e74eb8
2021-09-24 17:15:20 +00:00
Bill Yi
b8dff25882
Merge changes from topic "presubmit-am-c3196624e4cc4449bc4baa3c0475ba42" into sc-dev-plus-aosp am: 3d46803aee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898516
Change-Id: I35df749b6c90df88c39b385a6fe6b973d30ce5ad
2021-09-24 17:15:11 +00:00
Bill Yi
767ce7ca1b
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2ac6a59163
am: fab8681446
-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: I84c2a01d26139d8b82755e98b052b60751dc3153
2021-09-24 17:15:11 +00:00
TreeHugger Robot
df6573b91e
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898511
Change-Id: I264dbd4f666e93d707ddc9b4486f55552a9a7a46
2021-09-24 17:14:45 +00:00