Bill Yi
1d7c852537
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3 -s ours am: 3ed7097ead -s ours am: 33f540213a -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: I787039dba9d86614149e8410434342ef8e98dab4
2021-08-22 18:27:12 +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
da92745ae4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5 -s ours am: 7643d374b5 -s ours am: cc357115f8 -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: Id1398e9ed1a7b5eb17631abf509642f1e6f45b48
2021-08-22 18:26:47 +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
TreeHugger Robot
bc64b4e00e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40 -s ours am: cea531d25f -s ours am: f3e12c0d3c -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: I1d78878d51f8e56821bf762c14cc7c4f60164fd2
2021-08-22 18:26:18 +00:00
TreeHugger Robot
f3e12c0d3c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40 -s ours am: cea531d25f -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: Ic2e48195de8200bcacae3dc4b0f667efa85142e8
2021-08-22 18:22:10 +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
TreeHugger Robot
5e47cd3d02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40 -s ours am: 7d5abfaa04 -s ours am: fce4bebfc4 -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: I0a3476f8aeab3ac0d2138d46ebf2423e3dcf36f8
2021-08-22 18:17:31 +00:00
Bill Yi
33f540213a
[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: I36ff2be3ac56b532491235567b28486736b411f5
2021-08-22 18:17:27 +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
TreeHugger Robot
3d5c73b7e2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e8da5d2aed -s ours am: aa8bac5523 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650238
Change-Id: I4da7b87867ad18063022963326d808ddd3563807
2021-08-22 18:17:18 +00:00
Bill Yi
cc357115f8
[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: I794248c5648d7a82dd30ae511329380af527984d
2021-08-22 18:17:11 +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
TreeHugger Robot
fce4bebfc4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 2bd8661d40 -s ours am: 7d5abfaa04 -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: I61817a52c45380743709b1e00f6b2a79ef554803
2021-08-22 18:16:57 +00:00
TreeHugger Robot
cea531d25f
[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: I82aa3df4489ad5f788a10cf1bfafbef3a986fae5
2021-08-22 18:08:15 +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
aa8bac5523
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e8da5d2aed -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15650238
Change-Id: Ibc4e588732aa66ea4fc50d643ef5b694483402a7
2021-08-22 18:01:59 +00:00
TreeHugger Robot
dde53740fc
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-22 17:45:29 +00:00
TreeHugger Robot
2bd8661d40
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-08-22 17:45:19 +00:00
TreeHugger Robot
e8da5d2aed
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-08-22 17:45:11 +00:00
Bill Yi
1ef7828194
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie6d3fb138bd7d064ad0892b666cf9d22a7dab2c9
2021-08-21 10:53:24 +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
8982b9ffa0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b 2p: ce5eb2ba02
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: If9ed661990b675889510056532ada80f2d622a6e
2021-08-21 10:46:17 +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
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
ce5eb2ba02
[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: Ib3eaf863bc9e6417be9f83dcd118384e5c7df616
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
27a679f72f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2163f238edcbb2a459255f4b3f3cae5e80d0d88c
2021-08-21 10:42:03 +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
143c55bb9a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a79808bce4
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649788
Change-Id: I0e680e754ae648b54d34786a5de46ed3c3536c17
2021-08-21 10:21:23 +00:00
Bill Yi
a79808bce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ab907c4c7fd33571a971f14c46abe98e00af4db
2021-08-21 10:21:11 +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
Menghan Li
45d410ed91
Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4 am: 2fa8b94643
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15501580
Change-Id: I275ea531be18bc1b0aa3fe372f59f89e4d4590ba
2021-08-20 22:10:23 +00:00
Menghan Li
2fa8b94643
Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev am: f7db8d7ee4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15501580
Change-Id: Ic1643d4bd000405d45d87dab6fea35402ec5041a
2021-08-20 21:40:35 +00:00
Menghan Li
f7db8d7ee4
Merge "[Material Next] Accessibility gesture tutorial dialog" into sc-v2-dev
2021-08-20 21:05:44 +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
Automerger Merge Worker
5f40d5c6a5
Merge "Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 4e764fa2de" into sc-v2-dev-plus-aosp am: 4db621e5a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673
Change-Id: Ibdfa2e3406ec0a2a445a52c28a7029e9f910afee
2021-08-20 18:03:07 +00:00
Govinda Wasserman
5963ef2202
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 26f121b673 am: f04886df8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673
Change-Id: I6a3effb0337fc1c43c29fc34992cf3b4504cb360
2021-08-20 18:02:39 +00:00
Automerger Merge Worker
4db621e5a1
Merge "Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 4e764fa2de" into sc-v2-dev-plus-aosp
2021-08-20 17:47:41 +00:00
Govinda Wasserman
44254e6d45
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 4e764fa2de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673
Change-Id: I6b9ee521293849d3c562a14e0644331e93bfbf48
2021-08-20 17:47:37 +00:00
Govinda Wasserman
f04886df8b
Merge "Revert "Revert "Add sensitivity configuration to long press power dialog""" into sc-qpr1-dev am: 8351a9a504 am: 26f121b673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15640673
Change-Id: I848c23910f68343f9a3ff52acbc9a03a14882096
2021-08-20 17:47:33 +00:00
Govinda Wasserman
4e764fa2de
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: I5f5d2a747e8867f705666328a9feb53448692e06
2021-08-20 17:31:31 +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
5a7573fbe4
Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: 8157ef107a am: 0b12207ac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257
Change-Id: Id013aab12a8e5a4a9f2528f2369bc4b588b936d2
2021-08-20 11:35:37 +00:00
TreeHugger Robot
49ab5d1a72
Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: ef2c734413 am: 701b89a3b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257
Change-Id: Id48f9bb739d55cb239133fb98cd72b2c97c1e3e0
2021-08-20 11:35:29 +00:00