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
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
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
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
ykhung
37ddf4bc3e
[B&R] backup the battery optimization mode for installed apps
...
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: I4671e48a9d3b315362b451384db637d5cae36a4d
2021-08-23 12:32:07 +08:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
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
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
abc69e0913
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: 7e20c76c5e
-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: I2e6ce8568e9fc3a29f4e4a30f8e62d6c7816b41f
2021-08-22 18:45:56 +00:00
Bill Yi
fb032fde96
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 27583c0a16
-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: Id92c6b1a96e0f1eefd94aecc2e3648e86811f08a
2021-08-22 18:45:42 +00:00
Bill Yi
cfe2aa8e35
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: a09970a7c7
-s ours am: ac54544c91
-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: I3de1ad688a55e2f8fc0ec8ab2c36910290a128eb
2021-08-22 18:41:38 +00:00
Bill Yi
52292c0d76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: c4934a29a9
-s ours am: 1b5eff63fc
-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: If607710ee1198ad8f883359d50ff0d7403f50305
2021-08-22 18:41:23 +00:00
Bill Yi
19bfb2d5c9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours am: 75efc0cd4b
-s ours am: f51eb39d65
-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: I0ab8edc2154205f6693598d96e25a4533b4a0500
2021-08-22 18:41:08 +00:00
Bill Yi
3af8be69fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours am: d66da997ef
-s ours am: 63aecef661
-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: Ief86c60d3a9922364fd42aee90a8e29c3f749527
2021-08-22 18:40:53 +00:00
Bill Yi
7e20c76c5e
[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: I878bdc4a465b24c6757c64d5cdd9b9757a55fca7
2021-08-22 18:33:28 +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
27583c0a16
[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: I3d317d20fc66adfb85a64cd03b897cfb40e59064
2021-08-22 18:33:00 +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
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
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
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
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
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