Bill Yi
07249babd3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours am: e8eeb4a1ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Ib8154aa2eb17d7fa41b71a9d5a1d6a34c842d0bb
2021-08-23 04:38:46 +00:00
Automerger Merge Worker
d084b97e00
Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp
...
* changes:
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
am: 0f5c1fd924
-s ours
2021-08-23 04:38:11 +00:00
Bill Yi
3d504a87f6
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I0962ac31cd4227ced779e90a2637d6bb8e3fad6a
2021-08-23 04:38:09 +00:00
Bill Yi
cfdea9640f
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I8723dc14c877e14d0ec1252bff2e57e67ccc8b46
2021-08-23 04:38:09 +00:00
Bill Yi
22b2889345
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
am: 0af7a53e0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I40eed7a068e8eab4f1afdc6a258541d3896c8f61
2021-08-23 04:38:08 +00:00
Bill Yi
89adb1b207
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
am: 0f5c1fd924
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I05af183d8c7ea560a95a35a95d08e5a1a8e0cf54
2021-08-23 04:38:08 +00:00
Bill Yi
1a5b010e20
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: If8b78b2722decc2a182fbded4f594db881eaf9ee
2021-08-23 04:38:06 +00:00
Bill Yi
e8eeb4a1ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Ie84b2cd119dc71eea967c30a3c522aaf86f3ddb2
2021-08-23 04:37:03 +00:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-23 04:21:54 +00:00
Bill Yi
a536531bd9
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
38f55441d3
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Android Build Coastguard Worker
fb0bc018af
Snap for 7664979 from a09970a7c7
to sc-qpr1-release
...
Change-Id: Ie67b35bcea3a867af74682ba386aa10021e996fc
2021-08-22 23:08:02 +00:00
Bill Yi
ac54544c91
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I170f5b1ce0c25079b8f405bbe297a8f93a7429c6
2021-08-22 18:33:20 +00:00
Bill Yi
1b5eff63fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ifbe1ff8d2d75aa39b46e505cce5c68c5c7b05c35
2021-08-22 18:33:01 +00:00
Bill Yi
f51eb39d65
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 75efc0cd4b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Ifea626a170c56f11c32e5e84de3956d2c3c355e0
2021-08-22 18:26:58 +00:00
Bill Yi
63aecef661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: d66da997ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I78d1728d3d22007702de625ec1d6b773139afe68
2021-08-22 18:26:41 +00:00
Bill Yi
a09970a7c7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I75a2d2ff05cb9fd3c74bd16aa06a0893dcf7dd2a
2021-08-22 18:18:05 +00:00
Bill Yi
c4934a29a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I9e63f46f668fab0c59ad240d952d0dc2d63fe09c
2021-08-22 18:17:53 +00:00
Bill Yi
75efc0cd4b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Ib34afcfdd9953968c0e2b13cf454e3e9173c2b18
2021-08-22 18:17:18 +00:00
Bill Yi
d66da997ef
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I60c3c3b85e60b3afeb4a8767852c5f3fc745880e
2021-08-22 18:16:59 +00:00
Bill Yi
3ed7097ead
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
2021-08-22 18:02:27 +00:00
TreeHugger Robot
7d5abfaa04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650237
Change-Id: I52fcb21da4f94243efbe577308f08eb5474fdbd3
2021-08-22 18:02:21 +00:00
TreeHugger Robot
2bd8661d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-22 17:45:19 +00:00
Bill Yi
0f61194307
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3ea6d77ccace207249eef5d86fc331f22db54dac
2021-08-21 10:49:31 +00:00
Bill Yi
0af7a53e0a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Idd26c421684f3173fd30b8b0cef50812cf918165
2021-08-21 10:46:13 +00:00
Bill Yi
0f5c1fd924
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I0498edec2d10fdf5864be81d71cf0e23c109717b
2021-08-21 10:46:13 +00:00
Bill Yi
93eb76377b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
2021-08-21 10:45:59 +00:00
Bill Yi
70b0c311a5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
2021-08-21 10:31:37 +00:00
Bill Yi
b762f335e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieab1a39a1764ced3fe6dce11e5e8f9aa2b12498b
2021-08-21 10:17:34 +00:00
Android Build Coastguard Worker
f8594fadcd
Snap for 7662878 from 8351a9a504
to sc-qpr1-release
...
Change-Id: Ife12a4d2039efcf8aa3910d7311140ddf439d3a0
2021-08-21 03:07:54 +00:00
Joe Bolinger
f78cec292c
Remove sliceable attribute from biometric preference controllers.
...
This removes the top-level UI switch on some of the boolean preference settings.
Bug: 193438173
Test: atest com.android.settings.biometrics
Change-Id: If1cd2cb9ae456021fcdf0efc5002db4a083b9689
2021-08-20 18:42:50 +00:00
Govinda Wasserman
26f121b673
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673
Change-Id: Ib92603ae0210aaa025f722d0d734b11e6030386c
2021-08-20 17:31:29 +00:00
Govinda Wasserman
8351a9a504
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev
2021-08-20 17:15:31 +00:00
Govinda Wasserman
3869aac6d3
Revert "Revert "Add sensitivity configuration to long press power dialog""
...
This reverts commit c4084d4141
.
Reason for revert: Dependant change has now successfully been propagated to sc-v2-dev child graphs
Change-Id: I1f6126a423c72540d219b99e20b464b51ef65923
2021-08-20 17:06:40 +00:00
TreeHugger Robot
ef2c734413
Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257
Change-Id: I9d2819fd3a9a043302295e8f1c6ba9d0e67c86cf
2021-08-20 11:11:08 +00:00
TreeHugger Robot
ea4e5a33bf
Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev
2021-08-20 10:57:58 +00:00
Sam Chang
c4084d4141
Revert "Add sensitivity configuration to long press power dialog"
...
This reverts commit de2f00df41
.
Reason for revert: This CL will cause build break, b/197290948
Change-Id: Ibee2d4bc5e445e863585c291b4b2741bcb4b4c81
2021-08-20 06:46:33 +00:00
Android Build Coastguard Worker
3829f4b3e0
Snap for 7659088 from 7931ff7ae4
to sc-qpr1-release
...
Change-Id: Ibb305330e6ee8cabd314d8d3350d4be41cd48eda
2021-08-20 01:08:01 +00:00
Bill Yi
8818495cfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours am: a131a4e35d
-s ours am: 7931ff7ae4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I31c3e1fb5e501d6135679fa211b60f72fc15ced1
2021-08-19 19:41:14 +00:00
Bill Yi
1d2ce0dc59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours am: f56033304c
-s ours am: 011f12be5c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I54133487d6c5760abfdf28696fd1d5c22430b692
2021-08-19 19:41:08 +00:00
Bill Yi
0c5b96da0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours am: de6423d2ee
-s ours am: 8fd0c3d73d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I4bb784c22d9a4c0c2f519f95cb8e4f42b546d133
2021-08-19 19:40:45 +00:00
Bill Yi
92e80927dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours am: d46732c0d0
-s ours am: 07eddeeb3a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I6bcd707027ac774f225c3df1a9bb9241cc76c3f3
2021-08-19 19:40:35 +00:00
Bill Yi
5d20daf444
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours am: a131a4e35d
-s ours am: 73c14fcce0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: If535820da310aaf8fd9f91fa9bb3948841a47dd8
2021-08-19 19:40:10 +00:00
Bill Yi
386bfd3f54
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours am: f56033304c
-s ours am: f39571d27c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ie4236f7065dac61bff4bf07a0a3dadeb19f88062
2021-08-19 19:40:04 +00:00
Bill Yi
82067cfb6e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours am: de6423d2ee
-s ours am: 4e14188b40
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Icbc8d5679cb21a6d000d146cfe13fbec92570980
2021-08-19 19:39:59 +00:00
Bill Yi
0caa8d7dcd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours am: d46732c0d0
-s ours am: 2e0e5306cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ief646a803bdad6cdf36bc8ef0abf18c15927a83a
2021-08-19 19:39:32 +00:00
Bill Yi
7931ff7ae4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours am: a131a4e35d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Iba3f93afb07202da274a6cac78445b1bfe92c11c
2021-08-19 19:24:54 +00:00
Bill Yi
011f12be5c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours am: f56033304c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I91d1ecbc4dffb2dd3ab86642f3e22a93fd7245d3
2021-08-19 19:24:50 +00:00
Bill Yi
8fd0c3d73d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours am: de6423d2ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I5c590ca000a1bf792c622d33c0ac63d5f8a7d715
2021-08-19 19:24:45 +00:00