Presubmit Automerger Backend
620448800d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I0afa87c3b7044979344179aafc4edb82669a0982
2021-09-07 23:51:48 +00:00
Presubmit Automerger Backend
77e02cbb71
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15781238
Change-Id: I82346cae7ca0fe69c3ad76815a9becf036c38ba2
2021-09-07 23:51:48 +00:00
Bill Yi
d770312ec1
Import translations. DO NOT MERGE ANYWHERE
...
BUG:198847997
Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
2021-09-07 23:51:36 +00:00
Automerger Merge Worker
983eb423de
Merge "Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
am: c6f7cf99e9" into sc-v2-dev-plus-aosp am: fcaf1b5497
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I8d13260d07db21cd3b8c9555a3e53f9865e43d4e
2021-09-07 21:14:04 +00:00
TreeHugger Robot
145878081b
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
am: fb39c456a8
am: f999ee1943
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I77711a7054b64695c2e529716d5024e867be1fb1
2021-09-07 21:13:14 +00:00
Automerger Merge Worker
fcaf1b5497
Merge "Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
am: c6f7cf99e9" into sc-v2-dev-plus-aosp
2021-09-07 20:58:35 +00:00
TreeHugger Robot
74a740a2cf
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
am: c6f7cf99e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: Ic034ec248154113199888fbb14c96dc44357d4bb
2021-09-07 20:58:31 +00:00
TreeHugger Robot
f999ee1943
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
am: fb39c456a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I6d2ec035cebe8796d7c785a3a155251c44be3641
2021-09-07 20:58:26 +00:00
TreeHugger Robot
c6f7cf99e9
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I1a9d3533c92a0a97dc0e673e67a1f33f4ae3cd6a
2021-09-07 20:42:27 +00:00
TreeHugger Robot
fb39c456a8
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev am: ec9a292393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15777104
Change-Id: I5b8af0112efa816d38d08a9a84e10b9ebb016531
2021-09-07 20:42:23 +00:00
TreeHugger Robot
ec9a292393
Merge "Add 'snoozing' to NLS consent dialog" into sc-qpr1-dev
2021-09-07 20:29:33 +00:00
Julia Reynolds
92221fd563
Remove unneeded NEW_TASK am: 717e3f6270
am: 8446a7d455
am: fd4dcfe26b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I94c0f6f045a8bc47dd2f8e22f5452d0ded7ddac2
2021-09-07 19:26:54 +00:00
Julia Reynolds
e18d228a5b
Remove unneeded NEW_TASK am: 717e3f6270
am: 60dd5ef026
am: cea348541f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I62a8e597284701f0a90a234d8ff591be41b9eb26
2021-09-07 19:25:30 +00:00
Julia Reynolds
fd4dcfe26b
Remove unneeded NEW_TASK am: 717e3f6270
am: 8446a7d455
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: If97dc11d5259b2663ffa7b9db456ba2bdf87cde2
2021-09-07 19:03:34 +00:00
Julia Reynolds
cea348541f
Remove unneeded NEW_TASK am: 717e3f6270
am: 60dd5ef026
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: Ibcc61f6a53090ec528f1908d511cc8395f7a6db9
2021-09-07 19:03:07 +00:00
Julia Reynolds
60dd5ef026
Remove unneeded NEW_TASK am: 717e3f6270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I8f1564b6206d52fca34e510d41e772dcce4ed150
2021-09-07 18:51:32 +00:00
Julia Reynolds
8446a7d455
Remove unneeded NEW_TASK am: 717e3f6270
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15778692
Change-Id: I7c184dc768503f4b121bf84c2339e531818efcc8
2021-09-07 18:51:27 +00:00
Julia Reynolds
717e3f6270
Remove unneeded NEW_TASK
...
To improve animations
Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +00:00
Julia Reynolds
520c80d649
Add 'snoozing' to NLS consent dialog
...
Test: manual
Bug: 195031401
Change-Id: I93226e89f033689d9731b6d3efd79bb9fdf628b4
2021-09-07 13:17:49 +00:00
TreeHugger Robot
0571ab940a
Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9
am: 89a745dd8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811
Change-Id: Ib9173bcda2280a683fda2e163bfc7467923d0bf2
2021-09-07 08:00:49 +00:00
TreeHugger Robot
89a745dd8c
Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev am: f8bb8aced9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756811
Change-Id: Idd2af151dcb4c0b8bb8f7fd04f8574544590b467
2021-09-07 07:37:54 +00:00
TreeHugger Robot
f8bb8aced9
Merge "Define menu keys for highlighting the menu entry on 2-pane UI" into sc-v2-dev
2021-09-07 07:27:05 +00:00
Jason Chiu
7426ab7b9f
Define menu keys for highlighting the menu entry on 2-pane UI
...
- Define an attribute for highlightable menu keys
- List the keys for Settings menu entries
- Support parsing the attribute
Bug: 199017944
Test: robotest
Change-Id: I5759bff591c79d498fffb8b2c2b57f2cb66c4421
2021-09-07 06:32:19 +00:00
Presubmit Automerger Backend
1115127fb6
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
-s ours am: 1f10c50614
-s ours am: f2c3bf878d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: Ibf39f7b5a2700f98c7ef9ed1e01c36273e494be4
2021-09-07 05:08:40 +00:00
Presubmit Automerger Backend
32a7638839
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
am: 3e32235ad3
-s ours am: 290d3f7d06
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: Idb47d6c2cd09ca217f13e64a3056b7e9b17e7c47
2021-09-07 05:08:04 +00:00
Presubmit Automerger Backend
f2c3bf878d
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
-s ours am: 1f10c50614
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: Ifa2ddaa398032c2af00a4b756a82de640c92dc10
2021-09-07 04:58:52 +00:00
Presubmit Automerger Backend
290d3f7d06
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
am: 3e32235ad3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: Iec72e8b0879d28a133b2291fc9cd225973045b0f
2021-09-07 04:58:39 +00:00
Presubmit Automerger Backend
ba1cfde45d
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 585d501aff
am: d7e50f20fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I343cdfd861ea6814f5f7888d8f2c5b0ccd182c21
2021-09-07 04:58:33 +00:00
Presubmit Automerger Backend
3e32235ad3
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I5b07fbf557c04ac2cb5f39a07a157046f1079d43
2021-09-07 04:47:13 +00:00
Presubmit Automerger Backend
1f10c50614
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 4dde18fc09
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I3056dfca5698187d68c2815c35db4ef31eed3eff
2021-09-07 04:46:51 +00:00
Presubmit Automerger Backend
d7e50f20fe
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: 585d501aff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I61d4f0aedc979e9d6d79c8035bf7e441e68c0e7b
2021-09-07 04:46:50 +00:00
Presubmit Automerger Backend
b340747311
[automerger skipped] [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
am: ea65ae36c3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Change-Id: I0aa90e4e5c538cea3aab299c22b2094e768e1964
2021-09-07 04:46:23 +00:00
SongFerngWang
eaa71ac6de
[VoNR] VoNR settings
...
Allow user to enable or disable voice over NR.
Bug: 191203577
Test: atest
com.android.settings.network.telephony.NrAdvancedCallingPreferenceControllerTest
Change-Id: I9be4716d0cdac5d698c2058be65bfa541495d012
2021-09-07 10:57:34 +08:00
Wilson Wu
395e839b10
Merge "Update settings PrimarySwitchPreference reference"
2021-09-07 02:51:20 +00:00
Presubmit Automerger Backend
585d501aff
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
2021-09-07 01:57:06 +00:00
Presubmit Automerger Backend
ea65ae36c3
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: If3e1b890e7bbc697535019b3f3545c9d1a0644c7
2021-09-07 01:57:05 +00:00
Presubmit Automerger Backend
4dde18fc09
[automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850
Bug: 198858684
Change-Id: Ia1cb0bebbab85af8bda052e0c430527909949562
2021-09-07 01:57:04 +00:00
Curtis Belmonte
e7849fb0dc
RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment
...
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll
Test: Manual
Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
2021-09-06 18:56:38 -07:00
Tsung-Mao Fang
eb969df581
Update window extension library am: 8203737671
am: 37cfc2775e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15771548
Change-Id: Ie238533b8645ebf2b2a401c46280f011792939c5
2021-09-06 15:01:24 +00:00
Tsung-Mao Fang
37cfc2775e
Update window extension library am: 8203737671
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15771548
Change-Id: I7d61c918ceea2a48e1373d859acb6b58956a9d47
2021-09-06 14:46:50 +00:00
Tsung-Mao Fang
8203737671
Update window extension library
...
New library supports to show the debug info.
Test: adb logcat |grep "SplitRuleResolution"
Fix: 195113219
Change-Id: I042c8c00da7234fce051928e5d9cf5bfc1bd4850
2021-09-06 21:24:36 +08:00
Menghan Li
4b7494f5c9
Merge "Fix color checking error of the repohooks" into sc-v2-dev am: f6c50fefd0
am: 805e33ae6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15749103
Change-Id: I8fd1d28fb1181aba66bbecf733714cb3bb67becb
2021-09-06 11:22:23 +00:00
Menghan Li
805e33ae6b
Merge "Fix color checking error of the repohooks" into sc-v2-dev am: f6c50fefd0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15749103
Change-Id: I22c44dfd19861f8e60973d89b822cef16d2196d2
2021-09-06 11:07:53 +00:00
Menghan Li
f6c50fefd0
Merge "Fix color checking error of the repohooks" into sc-v2-dev
2021-09-06 10:55:08 +00:00
TreeHugger Robot
a366a24b4e
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7
am: 903293aa41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485
Change-Id: I8558d9e58a9ff86d5ce4df95e551b350fc5a02d6
2021-09-06 09:49:27 +00:00
Jason Chang
39ebcd090b
Fix hold volume keys don't trigger the one handed mode in
...
One-handed mode settings page
Add to support observing A11y's Shortcut Hardware provider key
ACCESSIBILITY_SHORTCUT_TARGET_SERVICE
Bug: 193411296
Test: manual verified on System > Gestures > One-handed mode shortcut
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedEnablePreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedMainSwitchPreferenceControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionPullDownPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedActionShowNotificationPrefControllerTest"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.gestures
.OneHandedPreferenceCategoryControllerTest"
Change-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
Merged-Id: I4704a56873f14e52db8f7c0468eed17f190c5dce
2021-09-06 08:45:27 +00:00
TreeHugger Robot
903293aa41
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev am: 2ff09ceeb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15743485
Change-Id: I3c4676dfeb01743cd4aff1af440f1f819829a138
2021-09-06 08:34:46 +00:00
TreeHugger Robot
2ff09ceeb7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev
2021-09-06 08:10:21 +00:00
Betty Chang
56d0ee9099
[automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
am: edd650f6b5
-s ours am: becaef984f
-s ours
...
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 8dec2efc67
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Idb166e75d42cea5c1e7b73e7b8fb88d274323c2c
2021-09-06 04:20:50 +00:00
Betty Chang
80ed904830
[automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
am: ebdc0e26f6
am: 3b1c25573b
-s ours
...
am skip reason: Merged-In I7b7a3e1b6d72709acbae0a0433af897a28d73afc with SHA-1 bea12d4bbe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403
Change-Id: Ic9625c255a91c19d9f546d771e07af606c65a838
2021-09-06 04:20:44 +00:00