The Android Open Source Project
c77286a817
[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1
-s ours am: 51c0a2cb6e
-s ours am: 27067e7dd8
-s ours am: 4259d34ac9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212
Change-Id: I8739290c19ecdc17007920b97e669f6ffdc83c8c
2021-11-03 00:47:29 +00:00
The Android Open Source Project
4259d34ac9
[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1
-s ours am: 51c0a2cb6e
-s ours am: 27067e7dd8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212
Change-Id: I59009ecba231ac505949339e4ba3fcd48db9a4a7
2021-11-03 00:30:55 +00:00
The Android Open Source Project
27067e7dd8
[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1
-s ours am: 51c0a2cb6e
-s ours
...
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212
Change-Id: If522424ffa85db50121cc40410ed12394a5b8af0
2021-11-03 00:12:29 +00:00
The Android Open Source Project
51c0a2cb6e
[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1
-s ours
...
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177212
Change-Id: Iced88b946a227a369a465b018226d38b9fb69c43
2021-11-02 23:55:40 +00:00
TreeHugger Robot
e5129de80c
Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103
am: edc39b86fc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210
Change-Id: Ifb4b6b78520b58dafde517e68589033b18de0305
2021-11-02 23:02:53 +00:00
TreeHugger Robot
edc39b86fc
Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210
Change-Id: Ie4cd9c0a1d93bf325356c7538e891a815c6a2edf
2021-11-02 22:45:10 +00:00
TreeHugger Robot
2fa408c103
Merge "Add intent action to launch face enrollment" into sc-v2-dev
2021-11-02 22:32:27 +00:00
Curtis Belmonte
3de8abe8ee
Add intent action to launch face enrollment
...
Test: adb shell am start -a android.settings.FACE_ENROLL
Bug: 204100385
Change-Id: I3ac4395d80f0c36e8cab3b068c51ce03d0ecad7b
2021-11-02 14:18:11 -07:00
The Android Open Source Project
e5d3401aa1
Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE
...
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
2021-11-02 14:11:57 -07:00
Julia Reynolds
66cffd469f
Merge "Migrate to using fixed permissions"
2021-11-02 20:47:58 +00:00
ykhung
e7d4fefde0
Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a
am: b85bf67314
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737
Change-Id: I210c941a06b9d905bb8b37500377ad088f1d3230
2021-11-02 18:25:27 +00:00
ykhung
b85bf67314
Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737
Change-Id: I06e12f5250b7abe8ce5546cf3c91952f6704fe6e
2021-11-02 18:13:07 +00:00
ykhung
8f0291cd1a
Fix NPE issue of usage detailed page learn more button click event
...
root cause: some OEMs can not provide valid intent for help & feedback
solution: check the intent is vaild or not before show up the help content
Bug: 204844010
Test: make RunSettingsRoboTests
Change-Id: I4e7a7c926205be1179d55d33ada345024c8a44ab
2021-11-02 16:34:34 +00:00
ykhung
f5d2293cf3
Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5
am: 00bc734b6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323
Change-Id: Ifa6ecd6da1d6cc2c577aa8bcd4aa7c2e97c65cb6
2021-11-02 10:43:34 +00:00
ykhung
00bc734b6a
Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323
Change-Id: Ibcf69b3ff520458b486fdecd0ec92d8983167bac
2021-11-02 10:30:50 +00:00
ykhung
ae5bddc5e5
Avoid intermediate touch hover effect when a11y is enabled
...
Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I08e64a73547f71281fa94dc56ba8fe08312ebed0
2021-11-02 16:47:31 +08:00
Jason Chiu
7f6b9e26c9
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
am: 026b1b5df6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: If46903bb26371ea90075d1c6cc063af4d10a88d4
2021-11-02 02:43:42 +00:00
Jason Chiu
026b1b5df6
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32
Merge changes from topic "slice-highlight" into sc-v2-dev
...
* changes:
Add highlight menu keys for all toggle pref controllers and custom slices
Support slice deep links highlighting menu entries
2021-11-02 02:14:09 +00:00
Jason Chiu
ae5f30b15a
Merge "Declare a highlight menu key for ButtonNavigationSettingsAssistController"
2021-11-02 02:14:09 +00:00
TreeHugger Robot
5aa5035a9b
Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c
am: cdf991a7ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410
Change-Id: I5676cec612866c434204bbc6f548415a2508bbb6
2021-11-01 22:04:07 +00:00
TreeHugger Robot
cdf991a7ba
Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410
Change-Id: Iea2d9bad655ee100c9aba65310307e8c988cfa7e
2021-11-01 21:52:44 +00:00
TreeHugger Robot
faf0721f2c
Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev
2021-11-01 21:37:29 +00:00
Daniel Chapin
ba0a012b57
Revert "Update animation for fingerprint edu page"
...
Revert submission 16091075-update_lottie_fp_edu
Reason for revert: Droidfood Blocking Bug: 204719520
Reverted Changes:
I0c3b1ad93:Update animation for fingerprint edu page
Id07ee17fa:Update animation for fingerprint edu page
Change-Id: I0f301491c2b526443a40b916ac2d98093d80a759
2021-11-01 19:36:00 +00:00
Bonian Chen
e4e252aa95
Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2
am: 7f94d2ba0e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289
Change-Id: Idb8f5835dfc4c8aa73d6134a645eacee4f6f4fd5
2021-11-01 14:16:38 +00:00
Bonian Chen
7f94d2ba0e
Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289
Change-Id: I2b2c907e8341e1b80cc6145998dccc7a5dfab8cf
2021-11-01 14:06:24 +00:00
Bonian Chen
5d1400f8b2
Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev
2021-11-01 13:56:03 +00:00
TreeHugger Robot
9abf3e5e76
Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933
am: 137f9acac1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630
Change-Id: I53031d3f0c7abe2ac1a089534f0908c939ffb49c
2021-11-01 08:20:08 +00:00
TreeHugger Robot
137f9acac1
Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630
Change-Id: Ic9d497517b6778c413909917d485575a054dc331
2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933
Merge "Optimize battery optimize page control flow" into sc-v2-dev
2021-11-01 07:53:21 +00:00
Jason Chiu
1e00dc9c9a
Declare a highlight menu key for ButtonNavigationSettingsAssistController
...
Bug: 204695404
Test: manual
Change-Id: I787824d0a4ef79d697bb7cd254fca6fb9b64d16f
2021-11-01 15:32:39 +08:00
tim peng
8e9b052de4
Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29
am: a4197a7aa1
am: e6ebfee220
am: 63ec94e217
am: ad58b6cd59
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736
Change-Id: Ida42e9357e1bfab46436632e1e08d23da737d8ca
2021-11-01 07:25:44 +00:00
tim peng
ad58b6cd59
Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29
am: a4197a7aa1
am: e6ebfee220
am: 63ec94e217
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736
Change-Id: I93a51e0129d7791e619f2af80d84010daa998d3a
2021-11-01 07:11:43 +00:00
tim peng
63ec94e217
Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29
am: a4197a7aa1
am: e6ebfee220
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736
Change-Id: Ie0838ac36286b679f0ed5158ce97e0669f1fe2db
2021-11-01 07:01:31 +00:00
Jason Chiu
2989c50a23
Add highlight menu keys for all toggle pref controllers and custom slices
...
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
TreeHugger Robot
9caca05e59
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f
-s ours am: 803a4a84a8
-s ours am: 17d3f20ebf
-s ours am: 5ca439352e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Id78320268c5969e57caabb54e9e1e07f8568fd71
2021-11-01 06:55:54 +00:00
TreeHugger Robot
8f97c068a7
[automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45
-s ours am: c95398214f
-s ours am: 35cc26c1d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ifa50ffb8bc4324c60a9e5d2d1eda51fd7b57fde8
2021-11-01 06:54:03 +00:00
TreeHugger Robot
18e7e66eb7
Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1
am: 348a01d9fe
am: 14949b4a73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I9a0610b7c02c38be982f73d4c0a9c966ed8ad2c1
2021-11-01 06:54:01 +00:00
Bill Yi
d1fef05ffc
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
am: 88711716d8
-s ours am: c6a1634ddd
-s ours am: e97ccea80d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I397d75926218109552996c7f19eddf0b3be85112
2021-11-01 06:54:00 +00:00
TreeHugger Robot
b226386bed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e
-s ours am: ba70207c32
-s ours am: eb76baa8f4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155721
Change-Id: Icd98d15748b509b1d6e8626bbb07198cc4f401cb
2021-11-01 06:52:46 +00:00
Wesley.CW Wang
151b88f76f
Optimize battery optimize page control flow
...
- Post the setup logic into background and setup once only when leaving
this page, this can improve the performance since we won't setup
every time when switching preference
Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
2021-11-01 14:52:42 +08:00
TreeHugger Robot
7267fa688e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3
-s ours am: 89064bf1a0
-s ours am: 320aa7acf2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155722
Change-Id: I6abe268e1c8d07ff75ee5267a8722823008f2418
2021-11-01 06:52:17 +00:00
TreeHugger Robot
e0d1ec377b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f
-s ours am: 3ef8ed0bac
-s ours am: 0bf0236ef5
-s ours am: 759efbe3d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ia8b503e78fe3114de726e86334d7038fb04f81c0
2021-11-01 06:51:38 +00:00
Automerger Merge Worker
0b98263e67
Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a
am: c0eaec8037
-s ours" into sc-qpr1-dev-plus-aosp am: ebb11f1e6e
-s ours am: 0121404997
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271
Change-Id: I55f90925673555e2cc6ebec1eeb5befcc74d519f
2021-11-01 06:49:10 +00:00
Bill Yi
38d1d63dfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eb45210f6a
-s ours am: d497dee907
-s ours am: 4080a4ffd4
-s ours am: 2b9e68f26b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271
Change-Id: I8d359572f4fe04347c50f20e89c1ac68f048c671
2021-11-01 06:48:35 +00:00
TreeHugger Robot
d1d7fbb770
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f
-s ours am: 803a4a84a8
-s ours am: cb81759d15
-s ours am: fd3b39ea3e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ie6df36abac1d14a88856fed8c9379441010bee41
2021-11-01 06:47:37 +00:00
TreeHugger Robot
3ebf3d1694
[automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-dev-plus-aosp am: dfb6af177f
-s ours am: 671b1b64a7
-s ours am: d62c988995
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Id1de98e7928e47fc7410ab4f945bfe7f429d8a96
2021-11-01 06:45:52 +00:00
Bill Yi
d4b40c3dce
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
am: 4f200606a9
-s ours am: 94b058a0c1
-s ours am: 01d1cd7df5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I0bb83a867229f0e3cf2df413776f84723a4f81fa
2021-11-01 06:45:49 +00:00
TreeHugger Robot
95a731669d
[automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45
-s ours am: fe2a7627dc
-s ours am: 8adc1c1d96
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I0cb50cf9e94e1ee8a3f4c56d34fcf3d1682df79c
2021-11-01 06:43:53 +00:00
TreeHugger Robot
8d8c462e57
Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1
am: 5a64962814
am: 53c3e1d04e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ic5481d52fd1d97cba5f7b7e8ebbfe681289ddfaf
2021-11-01 06:43:52 +00:00