Commit Graph

87677 Commits

Author SHA1 Message Date
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
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
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
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
0b12207ac2 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: 8157ef107a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: I8793f955db5a58398cf4391eefeccb43c658abe8
2021-08-20 11:22:34 +00:00
TreeHugger Robot
701b89a3b9 Merge "Revert "Add sensitivity configuration to long press power dialog"" into sc-qpr1-dev am: ea4e5a33bf am: ef2c734413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15635257

Change-Id: Ibc897838a3d068d718df8be06e5ccd6b3925dbdd
2021-08-20 11:22:09 +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
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
YUKAI HUNG
902ae0a655 Merge "[B&R] backup the getFullPowerWhitelist() for battery setting" into sc-v2-dev am: 5d59c685d7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15611718

Change-Id: Ic2becc65d48bf577794578b2210152eccb59cb7c
2021-08-20 01:53:19 +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
583ca495e4 [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: 715423605d -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: I8bcaf1101f3863892831dd34a9f56c17823fccd4
2021-08-19 20:07:00 +00:00
Bill Yi
225d1ed56e [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: 9105e47157 -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: I867108d1cf0ea5c250760eb00270d65753b6f858
2021-08-19 20:06:53 +00:00
Bill Yi
8be592e130 [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: 8da46b4114 -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: Ib6a1f4e90e85efa2b191e0d847a5755f10870b09
2021-08-19 20:06:48 +00:00
Bill Yi
33f3a9afee [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: abdb9265b9 -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: Ifaa8e21ab4fbc5fb573ece413ba9c58c27d50647
2021-08-19 20:06:31 +00:00
Bill Yi
f6027c5a3d [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: 8818495cfb -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: I4f872601fd875dcf0a5206b71eb93d9f841928cf
2021-08-19 19:56:50 +00:00
Bill Yi
a42d6e2ace [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: 1d2ce0dc59 -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: I22417b5f3d6e97c893136b6405cc4944d766e128
2021-08-19 19:56:44 +00:00
Bill Yi
46a5214866 [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: 0c5b96da0f -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: Ibc6a9e490dafa980facb99a75bb6c5fb6d0a26d2
2021-08-19 19:56:38 +00:00
Bill Yi
130b0b0f13 [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: 92e80927dd -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: I8019e80f1c6a5d7175308c2bd2f6fdc972b3d7f6
2021-08-19 19:56:31 +00:00
Bill Yi
ff684ea4d1 [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: 5d20daf444 -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: Icd5995e57a33865ac09673330c86ab786bac1324
2021-08-19 19:56:25 +00:00
Bill Yi
304a47b0c2 [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: 386bfd3f54 -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: Iba201cc568340b0f5277f1da3f65a59c3b919e9b
2021-08-19 19:56:18 +00:00
Bill Yi
19948131b4 [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: 82067cfb6e -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: I9b12cb6e9858d1b628d40f469da6e8489b02cc0b
2021-08-19 19:55:54 +00:00
Bill Yi
61687b51a0 [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: 0caa8d7dcd -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: I45eb57af6ab864c5084c8043b7c3c3aef931c079
2021-08-19 19:55:23 +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
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
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
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
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