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
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
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
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
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
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
8157ef107a
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: I820689921ec31b567eccb16fa85675900403b208
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
YUKAI HUNG
5d59c685d7
Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev
2021-08-20 01:39:28 +00:00
ykhung
7cbc683d3e
[B&R] backup the getFullPowerWhitelist() for battery setting
...
BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy method name
Test command for backup manager:
adb shell bmgr backupnow com.android.settings
adb shell dumpsys backup | grep Current
Bug: 192523697
Test: make SettingsRoboTests
Change-Id: I2d5c51b5b5788d703a233f5df719a298382feb98
2021-08-19 23:59:21 +00:00
Bill Yi
715423605d
[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: Ifedac6d4e7500bc18e4006104ef59eefa16945fb
2021-08-19 19:40:58 +00:00
Bill Yi
9105e47157
[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: I05036b24afa08d14a8fd06b4ec013d38c154ab0e
2021-08-19 19:40:52 +00:00
Bill Yi
8da46b4114
[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: I0337590c667e2356c0268e8f194d40c2a5abfc5e
2021-08-19 19:40:47 +00:00
Bill Yi
abdb9265b9
[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: Ia6cf5be39bc9ffa9452dbf6a58038eaf08d71240
2021-08-19 19:40:29 +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
Bill Yi
07eddeeb3a
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I3da8a12210758eda87225874a2206a8c04d6c080
2021-08-19 19:24:10 +00:00
Bill Yi
a131a4e35d
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I1b4c1cf3fe9a91519f752241d93ddf50b7f1db4b
2021-08-19 19:11:00 +00:00
Bill Yi
f56033304c
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I5fa1bc908b59a08170c75434094b8a2ec18de9d9
2021-08-19 19:10:19 +00:00
Bill Yi
de6423d2ee
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ife7f670a35fb40793148e383f0ec61977befffa5
2021-08-19 19:09:12 +00:00
Bill Yi
d46732c0d0
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I9dc1c790b19badc9293ccb7ceb8e2719b4f2d9a0
2021-08-19 19:09:03 +00:00
Bill Yi
4c61f1ad4a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours am: d14aa78c7a
-s ours am: 7cf6899a9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I3e457e870c12875ff7dc3cfb11afd551c73e3317
2021-08-19 18:50:49 +00:00
Bill Yi
7e42054f67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours am: 4b72049845
-s ours am: 5104f6c447
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I06e3fb86f0f7fe1793dd0ae4cd45167d4f04b97f
2021-08-19 18:50:38 +00:00
Bill Yi
c748a50c90
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I51d44b97eafa5c3d0afba3314060168c75c0cc7c
2021-08-19 18:45:15 +00:00
Bill Yi
cae8b13289
[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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ic9b3f52f4d391c410ba9fce4dd3c06ff271eb9f5
2021-08-19 18:45:11 +00:00
Bill Yi
214068856c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-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: I1ec620bc435cc8cade11eedcd40b14aecd74a5bc
2021-08-19 18:45:10 +00:00
Bill Yi
dbb7139670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-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: Ia20257ffd7d365143c7f20da2c8694f07695f721
2021-08-19 18:45:08 +00:00
Bill Yi
7cf6899a9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours am: d14aa78c7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I094bfa812ab417a3e9f2383f3c0606dd6354e4f2
2021-08-19 18:36:45 +00:00
Bill Yi
5104f6c447
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours am: 4b72049845
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: Id4fc45428e44702a9b37541c9daa70de82e078c4
2021-08-19 18:36:11 +00:00
Bill Yi
5333f656cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-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: I282f2eb8c069e363b31ff018ff51f1a45b37e757
2021-08-19 18:30:11 +00:00
Bill Yi
d26b631da5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-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: I034015cd37baa3a0e64c4821684ecaf08348c2b8
2021-08-19 18:30:04 +00:00
Bill Yi
d14aa78c7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I471e1732559ef8be5da269d0ac57e8e9248d0b0a
2021-08-19 18:17:42 +00:00
Bill Yi
4b72049845
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: Ia6128614996ae93777b01760b0fd26e0b402597e
2021-08-19 18:17:06 +00:00
Bill Yi
2906d7dceb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-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: I3258ebd4e22af98fd20e0310512cd3db1ed2d160
2021-08-19 18:17:06 +00:00
Bill Yi
6718e1ee7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-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: Ia7592c1857dab18371f6284e5f6583217b148be9
2021-08-19 18:13:12 +00:00
Bill Yi
6a0b815394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-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: Ib07c6a9383e2256c8e995ad1d6b67ee4bfb02cb8
2021-08-19 18:12:15 +00:00
Bill Yi
57f1c163d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I7cf4e45992855e576ad9f0e4a25d1ea6e4405a1a
2021-08-19 18:05:22 +00:00
Bill Yi
6b38523ea7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I4a515aa1670ef66c889987cb1adbf3f891a5d41c
2021-08-19 18:05:22 +00:00
Jernej Virag
5d37f9b93d
Add sensitivity configuration to long press power dialog am: de2f00df41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: Iee7ce4a08a1a132e95eb9f4313b58c7fbe3eafd2
2021-08-19 15:16:26 +00:00