Commit Graph

94800 Commits

Author SHA1 Message Date
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
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
717e3f6270 Remove unneeded NEW_TASK
To improve animations

Test: manual
Fixes: 197609584
Change-Id: I4cfbe7386014ba1fb6808bfeb283955101c7e1a7
2021-09-07 17:08:41 +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
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
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
TreeHugger Robot
1a2d1017ec Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5 am: 6e55a559d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805

Change-Id: I37f62eb7d9c90adf05508587511bff547813e69c
2021-09-06 04:20:35 +00:00
Betty Chang
becaef984f [automerger skipped] Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: edd650f6b5 -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: I2f81d6f852d20d3f1c240f654c2074ac9d0f4c1b
2021-09-06 04:20:03 +00:00
Betty Chang
3b1c25573b Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5 am: ebdc0e26f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ia6abb73f2bfde7ad4c13ca0bcea28cfe6460968c
2021-09-06 04:16:51 +00:00
Betty Chang
ebdc0e26f6 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: I5a889a42d677e064b7ef553405fc0a19996961ad
2021-09-06 04:12:50 +00:00
Betty Chang
edd650f6b5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev am: adc41a55d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15751403

Change-Id: Ib0426da2b92a1c5771dffd2ff68618f14f331f44
2021-09-06 04:12:49 +00:00
TreeHugger Robot
6e55a559d4 Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev am: 50020de6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15756805

Change-Id: I985ccc7165c69eb47ed9668fc889a75186d4d8ec
2021-09-06 04:12:23 +00:00
Betty Chang
adc41a55d5 Merge "Change the SIM color for passing the GAR" into sc-qpr1-dev 2021-09-06 04:00:59 +00:00
TreeHugger Robot
50020de6f5 Merge "Revert "Revert "Support two pane design in the Settings app.""" into sc-v2-dev 2021-09-06 03:57:01 +00:00
Sunny Shao
1564ef5ca1 Add more info on the dialog of AllowBindAppWidgetActivity
- Show the label of the bound widget on the dialog of the AllowBindAppWidgetActivity.

Bug: 184676316
Test: manual test
Change-Id: Idf1f73bc1cdb8ef9ce632bfe4722b1469a6b8531
2021-09-06 11:52:51 +08:00
Tsung-Mao Fang
4781fc1687 Revert "Revert "Support two pane design in the Settings app.""
This reverts commit 07037dbc3f.

Reason for revert: <Issue already was fixed in ag/15743576 and ag/15743577>

Bug: 197716926
Change-Id: I72b98f8feb513f34e88e735efd578a8e3d9a1963
2021-09-06 02:41:26 +00:00
Curtis Belmonte
4ce94b1c65 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 9e3d13850e am: f854c14a0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I0a86664d7b0e579dab65c88b6db507423cdd8aba
2021-09-05 04:16:33 +00:00
Curtis Belmonte
18e06591d6 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 0cf4e6393f am: a2fe4f34a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I784d42df3fdb4c0a42d93930a072d2d3a321fd1a
2021-09-05 04:16:25 +00:00
Curtis Belmonte
61f0fd3a6c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 am: 91cfb2c06c am: a8b2f6ac9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I3dfbc9daeca6563872c90a0e46d48df42063a7a1
2021-09-05 04:16:17 +00:00
Curtis Belmonte
f854c14a0c [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 9e3d13850e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I723c5d0fe373318ce109a2c73039f1627f70eb6c
2021-09-05 04:01:39 +00:00
Curtis Belmonte
a2fe4f34a9 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b am: 0cf4e6393f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I313dfaa414411c011aa078166a5fbd0a4f821b4f
2021-09-05 04:01:09 +00:00
Curtis Belmonte
a8b2f6ac9d [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: 4f2f0ed6d5 am: 91cfb2c06c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: Id45643428f8f47f46171d035560dbede92720c8d
2021-09-05 04:01:03 +00:00
Curtis Belmonte
9e3d13850e [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 am: a9c1fa626b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Change-Id: I5e7cd47b755b7a397e026acfb474d528911d8b39
2021-09-05 03:49:02 +00:00