TreeHugger Robot
cc53ea6c8d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27
-s ours am: d263a1305d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898514
Change-Id: I6b6c6d59946ea2672a8ef378ca55ab12e42ef697
2021-09-27 16:10:05 +00:00
TreeHugger Robot
fba9d96a43
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
am: 6a9d8bc5bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: Iaf4cdb97bda02f79664e76dff13191a71300c885
2021-09-27 16:00:50 +00:00
Curtis Belmonte
402512fd6c
[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
-s ours am: d390efcddf
-s ours
...
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332
Change-Id: Id15b61aaaeab6f7e5ec0a1131eb91a1dec7767df
2021-09-27 16:00:19 +00:00
TreeHugger Robot
d263a1305d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: f337947e27
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15898514
Change-Id: Id1f0095a947ea075fc6d5a88a57a57ef11962d5d
2021-09-27 15:57:26 +00:00
TreeHugger Robot
6a9d8bc5bc
Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev am: cc1cc9a5f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895168
Change-Id: I5c6bd25d10088435a5f41010d825c5baf172a778
2021-09-27 15:49:47 +00:00
Curtis Belmonte
d390efcddf
[automerger skipped] Merge "Support configurable multi-stage UDFPS enrollment" into sc-qpr1-dev am: 491ef413c3
-s ours
...
am skip reason: Merged-In Ied4dbcb4a523f477c5ca1a9146d24751c6473f35 with SHA-1 73855e0a59
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15873332
Change-Id: I1c8aa676a3f9baff6e314bdd70c6f7bd26466e4c
2021-09-27 15:43:43 +00:00
Bill Yi
863e1394dd
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
am: 397b66c992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I655e66620f4062b04eb217b73171e541de7828de
2021-09-27 15:07:04 +00:00
Bill Yi
af535cc8cf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours am: 58cf11a21a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I33f58c803e225c4de893091ad13bef78c3e487f8
2021-09-27 15:07:04 +00:00
Bill Yi
50206b8664
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: 7245d9f02a
-s ours am: 797ea65d28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I234e5e7e6064ae8f9ac08d4acc378112e2aed823
2021-09-27 15:05:59 +00:00
Bill Yi
397b66c992
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev am: 7378aac868
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I038f654fef5583fcd295d5c9aa263a73b4bf1a40
2021-09-27 14:50:31 +00:00
Bill Yi
58cf11a21a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: fe3544e435
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: Ia888ce7e89c8e65e0915496c446d54e1ce07abc0
2021-09-27 14:50:29 +00:00
Bill Yi
797ea65d28
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
am: 7245d9f02a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915537
Change-Id: I8ba326f60d727b1941260042ef9c2dbe45bc3fe7
2021-09-27 14:50:00 +00:00
Bill Yi
7378aac868
Merge changes from topic "presubmit-am-460367b50a5247a5815d9ee30f905f93" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 92e5e1d54b
Import translations. DO NOT MERGE ANYWHERE
2021-09-27 14:33:16 +00:00
Arc Wang
0f9f5056d0
Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev am: d749c4eadf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15919134
Change-Id: Ibd8b3c84ecdcc881e9c9e92f75792cba02f41dcc
2021-09-27 12:00:18 +00:00
Arc Wang
d749c4eadf
Merge "[Large screen] Show full screen CreateShortcutActivity" into sc-v2-dev
2021-09-27 11:50:40 +00:00
Arc Wang
3e8164647c
[Large screen] Show full screen CreateShortcutActivity
...
Show full screen for CreateShortcutActivity because
-Launcher startActivityForResult for Intent.ACTION_CREATE_SHORTCUT and
activity stack starts from launcher, CreateShortcutActivity will not
follows SplitPaitRule registered by Settings.
- There is no CreateShortcutActivity entry point from Settings app UI.
Bug: 200916507
Test: manual
Launcher menu -> Widgets -> Settings -> select an item.
Observe if it goes back go launcher.
Change-Id: I437ff9b82d5a4548e10aed7bd083fd01352433f4
2021-09-27 17:44:41 +08:00
Bill Yi
b4c0945299
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49ce6473d6
-s ours am: 1935982f0c
-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: Ie60f0581a87d67d79eed2d953f14b0b2f35a2f38
2021-09-27 07:24:53 +00:00
TreeHugger Robot
e5f93b6af4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 33e5bdd34d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15915623
Change-Id: Ia9174c81e21e280ca54d923ac7512511eb1a6828
2021-09-27 07:05:30 +00:00
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
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
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
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
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