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
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
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
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
Curtis Belmonte
0cf4e6393f
[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: Ic1acdad9cbe161b9f2aa5fa72bc569505bb66317
2021-09-05 03:48:59 +00:00
Curtis Belmonte
91cfb2c06c
[automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3
am: 4f2f0ed6d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831
Change-Id: I5e527298abe4024bc5a8b1b42682e80a36c1e2a3
2021-09-05 03:48:42 +00:00
Curtis Belmonte
4f2f0ed6d5
[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: Id730b3ccfada949186db2ab61046ee57ca0b82dc
2021-09-05 00:11:08 +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
6ec46242cf
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: c1b136b503
am: 4686860c50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: Ib57393361ced52d2d3233ccc06b85525a6788b9a
2021-09-04 23:38:21 +00:00
Presubmit Automerger Backend
48bc6b659f
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: c1b136b503
am: 8bca5db8d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I913afb859272fa8924812aeb88e03db7128e4580
2021-09-04 23:37:17 +00:00
Presubmit Automerger Backend
74f6d47afa
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: 8d82ccdc24
am: 39928c53fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I898d80c0cd231482f8427da7e273a9b3237ec58c
2021-09-04 23:37:13 +00: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
8bca5db8d3
[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: I1cbf1709e0a934874d41ff4def45d806e1f36ae8
2021-09-04 23:24:47 +00:00
Presubmit Automerger Backend
39928c53fc
[automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253
am: 8d82ccdc24
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427
Change-Id: I6ea222460fa8c4653943e0c4bc73ea07bb1c2b52
2021-09-04 23:24:30 +00:00
Presubmit Automerger Backend
8d82ccdc24
[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: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
2021-09-04 20:49:34 +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
c003bc13f7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: 790491bc0f
-s ours am: 5978ae7c3b
-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: I30171c6cac3290ed2999673a5f2ced85da011a0e
2021-09-03 20:59:50 +00:00
Bill Yi
1c2c9f6c42
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: e49c8b9929
-s ours am: f4368a3a41
-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: I98a000adb1a309ed4b623fc0a1289d13bd61b8c5
2021-09-03 20:59:46 +00:00
Automerger Merge Worker
55e2fdbe94
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: e183f5a054
-s ours" into sc-qpr1-dev-plus-aosp am: eea7ed8ba2
-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: I4008ce63cce59b87930dafd05240a6b694bcde41
2021-09-03 20:59:43 +00:00
TreeHugger Robot
86a970f2f6
[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: 7c189c31fe
-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: Ic5208cbdfb9e67ddd4828464999a702351512865
2021-09-03 20:59:39 +00:00
Bill Yi
3f2b7b186a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: a4512d2431
-s ours am: ec8b0cc8ad
-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: Ib72d7a2177deb287f92ee43ecf8f0ce97d8b14b1
2021-09-03 20:59:34 +00:00
Bill Yi
5cf016c4c5
Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
am: 61af3ca025
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: If18241c1b9dee92eb5fbbe0c5b7d3db77235171f
2021-09-03 20:59:30 +00:00
Bill Yi
dd8ef157ec
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
am: 914dc714a2
-s ours am: 08d52721f9
-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: I3375bb436a062a3f731e2eb5f55842d31a1e4a59
2021-09-03 20:59:29 +00:00
Bill Yi
9454c648f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47
-s ours am: 790491bc0f
-s ours am: 64caad51c1
-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: I36f02603736b27a2fde5f8c03c1c6096a28dba1e
2021-09-03 20:59:24 +00:00
Bill Yi
14df0978f4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d
-s ours am: e49c8b9929
-s ours am: 15c25fb7df
-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: Iede457a60e62d894875636789a7fced154f9dd58
2021-09-03 20:59:19 +00:00
Automerger Merge Worker
ed6231d52f
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours am: 871ba0bacd
-s ours am: 977c1d696d
-s ours" into sc-v2-dev-plus-aosp
2021-09-03 20:59:18 +00:00
TreeHugger Robot
3dbbc1f2b6
[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: b36d7379e3
-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: Ia96c31de25884f3de2206f01f9cb219b32a74fa5
2021-09-03 20:59:16 +00:00
TreeHugger Robot
208f903db7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50
-s ours am: 20a3a9ac3d
-s ours am: 871ba0bacd
-s ours am: 977c1d696d
-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: I382fee248481fd93951f1f8bdab53ce40006b248
2021-09-03 20:59:16 +00:00
Bill Yi
1df8205c2f
Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-qpr1-dev am: aa77dc6ebb
am: 516823e59e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15748126
Change-Id: I0076e66cfacd542a436617657321d03b09346723
2021-09-03 20:59:11 +00:00
Bill Yi
56eb2c3a2d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
am: 914dc714a2
-s ours am: ec49cd0182
-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: I9e4972edd3673d6eec8492378bfcf2068a6ba258
2021-09-03 20:59:10 +00:00
Automerger Merge Worker
cf02f67258
Merge changes from topic "am-4518399b59a1469084ce724347b5bde1" into sc-v2-dev-plus-aosp
...
* changes:
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
am: f51b63cfb0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
am: 8b34aa6114
-s ours am: e7f4e52031
-s ours
2021-09-03 20:59:04 +00:00
Bill Yi
3ebb9a2928
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
am: f51b63cfb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: Ic85ab08e0d7b9303b6990921837f3866fbe0c1a6
2021-09-03 20:59:03 +00:00
Bill Yi
441f770ddd
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
am: 8b34aa6114
-s ours am: e7f4e52031
-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: I930321ed8ba8c59ab1e30c517298309d70421227
2021-09-03 20:59:02 +00:00
Bill Yi
740cc82a19
Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-qpr1-dev am: 0660fbec64
am: a87573a588
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15747952
Change-Id: Ia6fb3dc66c83dd6908012265d74700bf4853ee05
2021-09-03 20:59:01 +00:00
Bill Yi
558125edee
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
am: 8b34aa6114
-s ours am: af37131dd0
-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: I5b0e285ff5bb09c89ed102af84f909cbb4e3fbe7
2021-09-03 20:58:59 +00:00