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
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
f6c50fefd0
Merge "Fix color checking error of the repohooks" into sc-v2-dev
2021-09-06 10:55:08 +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
2ff09ceeb7
Merge "Add more info on the dialog of AllowBindAppWidgetActivity" into sc-v2-dev
2021-09-06 08:10:21 +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
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
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
Curtis Belmonte
a9c1fa626b
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Bug: 198847997
Change-Id: Ib88caa522f11d1be6bc3ef9479cfdefe4eabf10a
2021-09-05 00:11:06 +00:00
Curtis Belmonte
4592bf62a3
Update char limits for new UDFPS enroll strings
...
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.
Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
4686860c50
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: c1b136b503
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I0a4c5f88cbc9770457ee04275a64546c03699c45
2021-09-04 23:24:48 +00:00
Presubmit Automerger Backend
c1b136b503
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Bug: 198847997
Change-Id: Iaec5471868501824dbb0aa4cfe76feeff698133c
2021-09-04 20:49:34 +00:00
Curtis Belmonte
c84e18b253
Add new strings for UDFPS 4-stage enrollment
...
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.
Test: Presubmit
Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
2021-09-04 13:48:28 -07:00
Bill Yi
64caad51c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: 790491bc0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I36a2557cc817c200067583c4534a7c08a008a250
2021-09-03 20:58:00 +00:00
Bill Yi
15c25fb7df
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: e49c8b9929
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: Ie698240f1aac62213115d858e9626850c3aaf48d
2021-09-03 20:57:56 +00:00
TreeHugger Robot
b36d7379e3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours am: 0c0b1bf900
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748124
Change-Id: I9445bef9d761d93011c6662de3c4f2f331e9be19
2021-09-03 20:57:34 +00:00
Bill Yi
516823e59e
Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I3785da807138232c50a73c9ac6ef296f19c9adc2
2021-09-03 20:57:01 +00:00
Bill Yi
ec49cd0182
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
am: 914dc714a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I9c5ee2d9be3458991e2e5130a302d0e6d8d08641
2021-09-03 20:57:00 +00:00
Bill Yi
790491bc0f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I2fff9127a356f4942996e07da5ecc57d9b60bd92
2021-09-03 20:56:02 +00:00
Bill Yi
e49c8b9929
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I81ecebfcb12ac6b2909fad8999e83c22a9cae361
2021-09-03 20:55:53 +00:00
Bill Yi
a87573a588
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I49900fb9eb356739642c89c568fc64cc28e2d1c2
2021-09-03 20:55:45 +00:00
Bill Yi
af37131dd0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
am: 8b34aa6114
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: I9cb5efcd328f63618808b24111a0dc86bad57b42
2021-09-03 20:55:44 +00:00
TreeHugger Robot
0c0b1bf900
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748124
Change-Id: If1a90ba04044295d8653a1b3b3ce9e86b4c4d3cc
2021-09-03 20:55:01 +00:00
Bill Yi
6178db1a47
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-03 20:35:13 +00:00
Bill Yi
aa77dc6ebb
Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:35:13 +00:00
Bill Yi
a8c5a69b8d
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-09-03 20:34:05 +00:00
Bill Yi
0660fbec64
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
Import translations. DO NOT MERGE ANYWHERE
2021-09-03 20:34:05 +00:00
Bill Yi
b0f2b985f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac
-s ours am: fcec6efb01
-s ours am: b33a9e9bca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748123
Change-Id: I45e89df28a0955ea1b3b854c393c09c8083ad991
2021-09-03 20:23:32 +00:00
TreeHugger Robot
20a3a9ac3d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748124
Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
2021-09-03 20:22:37 +00:00
Bill Yi
b33a9e9bca
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac
-s ours am: fcec6efb01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748123
Change-Id: Ida46ec1fe7ee8f08e606a823761b80da7f217d1a
2021-09-03 20:06:28 +00:00
TreeHugger Robot
a08ae6df50
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748123
Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
2021-09-03 19:55:43 +00:00
TreeHugger Robot
5050698472
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e
-s ours am: 3a95d44f50
-s ours am: 9902d7a14b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747498
Change-Id: I57980dcaf54f815017641c6adb7a39a8be55838d
2021-09-03 17:53:42 +00:00
Bill Yi
3e508b953b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce
-s ours am: de3754f4bf
-s ours am: 65fa976c50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747500
Change-Id: I2cd97c62e9315366b425d9e50c6320cdb2a90267
2021-09-03 17:53:37 +00:00
TreeHugger Robot
9902d7a14b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e
-s ours am: 3a95d44f50
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747498
Change-Id: Idc3146a3ffaaeb3184b40b09cbb8faf3b17a4941
2021-09-03 17:35:57 +00:00
Bill Yi
65fa976c50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce
-s ours am: de3754f4bf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747500
Change-Id: I6698a049f45900b997140b3edba8e6276258a41c
2021-09-03 17:35:17 +00:00
Ember Rose
3377f1c04e
Merge "Revert "Support two pane design in the Settings app."" into sc-v2-dev
2021-09-03 17:17:38 +00:00
TreeHugger Robot
3a95d44f50
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747498
Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747500
Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
2021-09-03 17:15:14 +00:00
Tsung-Mao Fang
07037dbc3f
Revert "Support two pane design in the Settings app."
...
This reverts commit a12a0d1eb2
.
Reason for revert: See a build error in git_sc-v2-dev-plus-aosp/aosp_crosshatch-userdebug
Bug: 198722766
Change-Id: Ibf812bf92595f57409e3c6d9cda6a1dfa4a8c72c
2021-09-03 17:12:47 +00:00
TreeHugger Robot
16d1f56b9a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a64f9f261b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747957
Change-Id: I9f23acfb28b8b87f61791d5ae1fcd2d68d655b3e
2021-09-03 17:02:42 +00:00
TreeHugger Robot
31d4dc9360
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 76af5ca27c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748131
Change-Id: Ie34c1b6d04b96e63047c190aa3b6132f23ec7303
2021-09-03 17:02:15 +00:00
TreeHugger Robot
f1780afb1e
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-09-03 16:50:43 +00:00
TreeHugger Robot
84c4d4e69e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:39 +00:00
TreeHugger Robot
d9cd4e3358
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-09-03 16:47:33 +00:00
TreeHugger Robot
a64f9f261b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:47:06 +00:00
TreeHugger Robot
76af5ca27c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-09-03 16:46:41 +00:00