Commit Graph

94394 Commits

Author SHA1 Message Date
Bill Yi
7643a30cee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: b06fcc8fb4 -s ours am: db7d449225 -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: I3ae088e733f36b6959c76a0048ab139e8c95b5fd
2021-08-23 05:09:31 +00:00
Automerger Merge Worker
54e1722352 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp am: 21893b0972 -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: Idc0f038e3fc2cdaed9115191f8320995be7700cf
2021-08-23 04:59:38 +00:00
Bill Yi
34cb659f7f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: e8eeb4a1ec -s ours am: 07249babd3 -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: I85d7a92415862194e9aa5920241326ed95fb9641
2021-08-23 04:59:21 +00:00
Automerger Merge Worker
f894aafdaf Merge changes from topic "am-45b9491f655447d7bcbaec243df04490" into sc-qpr1-dev-plus-aosp am: d084b97e00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I9a9559de212682587b0c2cfead275649674e600b
2021-08-23 04:58:52 +00:00
Bill Yi
6fe86554e2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: 89adb1b207 -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: Id4d16013ce3b99e07aa4209516d3baeda6fa953b
2021-08-23 04:58:51 +00:00
Bill Yi
a25aeb69f4 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-dev-plus-aosp am: a536531bd9 am: 3d504a87f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: Ibfc44b107ba264cb14497f96b5b986ef039031e3
2021-08-23 04:58:29 +00:00
Bill Yi
64fe24ebc2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0af7a53e0a -s ours am: 22b2889345 -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: I2cb1f74574a87c71ac1c28ebd0ae26e2f9df2b08
2021-08-23 04:58:27 +00:00
Bill Yi
31506a0c66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours am: b5074981a1 -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: Ie68c733550db98226b62bbf1c8cbf9cc17facf6b
2021-08-23 04:57:29 +00:00
Bill Yi
360df88c4b Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-qpr1-dev am: 38f55441d3 am: 0be19629e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: I2f6233e6507fe9c568e11eca144ebbbba0af2cd2
2021-08-23 04:57:14 +00:00
Bill Yi
db7d449225 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b am: 0f5c1fd924 -s ours am: b06fcc8fb4 -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: Ie64f700de06257f243b64b79a64259c81f76ea1b
2021-08-23 04:57:12 +00:00
Bill Yi
b5074981a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -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: Ie6cf59ad347789416e5b96e51e2170203da21a84
2021-08-23 04:38:52 +00:00
Automerger Merge Worker
21893b0972 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-23 04:38:50 +00:00
Bill Yi
e943d5a0a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: 1a5b010e20 -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: I6374278799610f2626a00d6fe3db434b8ade4524
2021-08-23 04:38:48 +00:00
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
0be19629e3 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: I96b6102d076f0158306830c3990c24037d84127b
2021-08-23 04:38:11 +00:00
Bill Yi
b06fcc8fb4 [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: I7a7ccaf8808bf6aae1cfd9750117e0588ea47486
2021-08-23 04:38:10 +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
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
d68d89a16d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366 -s ours am: cb4d8096f9 -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: I549844cdd4525a7904e425b715dfe5b1287f6a49
2021-08-23 04:37:38 +00:00
Bill Yi
dc3bf1e5a2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 7faa876046 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649788

Change-Id: I5384e92e89c91c718abb4e17c4afd2e1814de0fd
2021-08-23 04:37:29 +00:00
Bill Yi
8c0f2e1e12 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod am: f75d95cc99
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792

Change-Id: Ia37b39f9121b9460b9cda8d6e703c471eabf743b
2021-08-23 04:37:17 +00:00
Bill Yi
cb4d8096f9 [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: I58f268fd7d26810a26cca56473268696e8a0dc1a
2021-08-23 04:37:10 +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
7faa876046 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-23 04:22:11 +00:00
Bill Yi
62091e911c Merge changes from topic "presubmit-am-dc85c8230a004703b0180742d1a9fbf3"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a79808bce4
  Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:22:11 +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
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
f75d95cc99 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod
* 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
6c5836f818 Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b 2p: ce5eb2ba02
  [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
8ec4ca3069 [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: abc69e0913 -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: I03029f67021b43536493a6239e6a93e50c28ff61
2021-08-22 18:57:08 +00:00
Bill Yi
a92c0c664f [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: fb032fde96 -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: I04ac8e4b1bac8d76035c2776790e167eb6ede44c
2021-08-22 18:56:47 +00:00
Bill Yi
4ccefe2518 [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: cfe2aa8e35 -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: Id3953f42e6962edb83f09717939d73aa4eb5e590
2021-08-22 18:56:26 +00:00
Bill Yi
726e72d84f [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: 52292c0d76 -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: I18f39b1e882547502250eaaba214cd3862e76ccb
2021-08-22 18:56:06 +00:00
Bill Yi
88a7a66c42 [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: 19bfb2d5c9 -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: I2272377633452ebbbeef5104a5acbed9f76f2884
2021-08-22 18:55:46 +00:00
Bill Yi
1d4538d025 [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: 3af8be69fd -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: I7dce4cb5cea5ed733fb6ee935dca0ea4755d9bc0
2021-08-22 18:55:22 +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