Commit Graph

77267 Commits

Author SHA1 Message Date
TreeHugger Robot
64ceb3d8c8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: ed312ef4fa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife48c37c57f413abf5c5a9f2bed0f9359174be7f
2020-08-19 16:34:40 +00:00
Beth Thibodeau
a9d2421cfd Increase char limit am: 11f8554405 am: 8baf14632c am: 043ec22d6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: I7716749e00962f7f48e70df700a7e17e8695fe42
2020-08-19 16:34:38 +00:00
TreeHugger Robot
88bfc14aba [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours am: b72f1f5475 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07d7f394e089e62f3b78c263a8b5b488d0985c61
2020-08-19 16:28:55 +00:00
TreeHugger Robot
e0d9bcd358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours am: d9bf35b984 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a068f50e0a4365616162989484f0566a4698ca3
2020-08-19 16:25:20 +00:00
TreeHugger Robot
7784b6bce2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 670032d648 -s ours am: cb977356ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6003ca52586d5771761d1e24c32af55ce34d63b
2020-08-19 16:25:10 +00:00
Beth Thibodeau
043ec22d6e Increase char limit am: 11f8554405 am: 8baf14632c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: Idd7563cc6b755fbcfaaf91d3cbebbd9552a021ef
2020-08-19 16:24:55 +00:00
TreeHugger Robot
ed312ef4fa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89eb71a124a82e9b64173ff1c37d92d085b5902d
2020-08-19 16:19:57 +00:00
TreeHugger Robot
b72f1f5475 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 1c9f9d50cf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie03b90f093eaedc84b8845b4cae9b08ea337eeeb
2020-08-19 16:19:22 +00:00
TreeHugger Robot
d9bf35b984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 90509b64fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65fd37462834c50a53f54e556fdc1649d47d5bb2
2020-08-19 16:12:37 +00:00
TreeHugger Robot
cb977356ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 670032d648 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56a3ebde83f44e6adcd089d6470d2c1af45466fc
2020-08-19 16:12:26 +00:00
Beth Thibodeau
8baf14632c Increase char limit am: 11f8554405
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12407749

Change-Id: I58ab443af092a3c96eaeb9ff0d30f6bd1b0fce29
2020-08-19 16:11:30 +00:00
TreeHugger Robot
1c9f9d50cf Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-19 16:09:20 +00:00
TreeHugger Robot
90509b64fe Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-19 16:03:05 +00:00
TreeHugger Robot
670032d648 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-19 16:00:55 +00:00
Treehugger Robot
5fdb21bb3a Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a am: f00eba5b87 am: aa6fd24c45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I3a2ca90b664c7d26469f9b1c040795331dc041a5
2020-08-19 15:54:11 +00:00
Treehugger Robot
aa6fd24c45 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a am: f00eba5b87
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I151077343415ebc89c7b2dd084586e038d0ebaf1
2020-08-19 15:41:28 +00:00
Treehugger Robot
f00eba5b87 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c am: ece108cc9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: If651cf8cbf4649931d7dd1daf5fb86c466f3d449
2020-08-19 15:30:09 +00:00
Treehugger Robot
ece108cc9a Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5 am: af6dfc4b8c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I7912e42f3ddc32e6470790b97c983b561906ffaf
2020-08-19 15:18:31 +00:00
Treehugger Robot
af6dfc4b8c Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: I32affa3deffca49e15bdeb9792bb995c00cb58f6
2020-08-19 15:08:01 +00:00
Treehugger Robot
e40251b9f5 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
2020-08-19 14:56:13 +00:00
Beth Thibodeau
11f8554405 Increase char limit
More chars needed for translation, and the settings screen that this is
displayed on can already scroll to accomodate extra text.

Fixes: 165029743
Test: manual
Change-Id: Ia7be446901ee6ede7d0ea3b71a4488485de79caf
2020-08-19 14:48:42 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
Julia Reynolds
f253250883 Add null check
Test: manual
Fixes: 161386023
Change-Id: Id4b3de8fd87f6c809dfcc18630af21fe0609c3e0
2020-08-19 09:45:00 -04:00
Bill Yi
fdb7673295 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I56762eb50f2043b18c864f4436bbe7baae8bfc69
2020-08-19 04:32:06 -07:00
Bill Yi
ce56500655 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1ad07265a1ca636a35b8ab530b1a59a6c71d2b76
2020-08-19 03:03:00 -07:00
TreeHugger Robot
a5ee544e7c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2020-08-19 08:51:07 +00:00
Bill Yi
db1ae6ce87 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I20ba771cd7f5a0bfc3ca1b9542f83fc80cb31edb
2020-08-19 01:35:18 -07:00
Automerger Merge Worker
abb6377cd5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours am: 6d103087f5 -s ours" into rvc-qpr-dev-plus-aosp am: 4996bc3703 -s ours am: a558cf0945 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1f4f5e04be09d49bafb43862b63cbe86026e72e
2020-08-19 08:04:06 +00:00
Automerger Merge Worker
88ceecfbfb Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 378313593e -s ours" into rvc-qpr-dev-plus-aosp am: db52445503 -s ours am: 2bf166b19e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I480f0170672c7702f08b4bfb29ee36b33c5bca9b
2020-08-19 08:04:01 +00:00
Bill Yi
8600c33b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 921836ad03 -s ours am: f5d33b43f5 -s ours am: 32255ce964 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idcfec7f899193406328566ef15f2ebee816adbd7
2020-08-19 08:03:53 +00:00
PETER LIANG
777eb1e2a7 Merge changes from topic "color_correction_b_148785841" am: f92160da4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369335

Change-Id: I237be7ea5c54a7ced8200cd53f6215dd68c330dd
2020-08-19 08:03:44 +00:00
Automerger Merge Worker
a558cf0945 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours am: 6d103087f5 -s ours" into rvc-qpr-dev-plus-aosp am: 4996bc3703 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I301f774389578a1278a62fc957a1cee23bae68d0
2020-08-19 07:59:46 +00:00
Automerger Merge Worker
2bf166b19e Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 378313593e -s ours" into rvc-qpr-dev-plus-aosp am: db52445503 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idff514e0ed505ad3428ea9bc5c010eeb4a416cc4
2020-08-19 07:59:39 +00:00
Bill Yi
32255ce964 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 921836ad03 -s ours am: f5d33b43f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib07433a871f1bcdb9d40010ec694b6e76e54ec67
2020-08-19 07:59:23 +00:00
PETER LIANG
f92160da4a Merge changes from topic "color_correction_b_148785841"
* changes:
  Fix the screen will move by itself when enabled Color correction.
  Refine and migrate the functions that related to update preference into the specific lifecycle.
2020-08-19 07:51:41 +00:00
Bill Yi
9d00912dc0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3362a8464a53c7b75b3e73989951668ddbcd18c1
2020-08-19 00:50:39 -07:00
Automerger Merge Worker
4996bc3703 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours am: 6d103087f5 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-19 07:46:38 +00:00
Automerger Merge Worker
db52445503 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 378313593e -s ours" into rvc-qpr-dev-plus-aosp 2020-08-19 07:46:36 +00:00
Bill Yi
432082489f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours am: 6d103087f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I53321eb8e940a22b141e8cfb50d7a893ac34a69a
2020-08-19 07:46:35 +00:00
Bill Yi
39f19a3075 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 378313593e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b9cf5f2a76337db868357a83941dc6ed21d8122
2020-08-19 07:46:32 +00:00
Bill Yi
f5d33b43f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours am: 921836ad03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87277b6d1daf03f3d6d75bcc741f6831a9e93fd3
2020-08-19 07:46:23 +00:00
Bill Yi
6d103087f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: 69605d12d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e07df5a184a12aa61997fb9db07fa7f80b71f88
2020-08-19 07:35:33 +00:00
Bill Yi
378313593e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieacb714ceb7fe2a150963db31fb8bc818132a7ef
2020-08-19 07:35:33 +00:00
Bill Yi
921836ad03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours am: dc84153e81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae39fc4a676ce4e8c4567dcc3649f8a167711078
2020-08-19 07:35:25 +00:00
Bill Yi
2b451871f5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I106d36bab1e76823ef48acd36f726646003cedd8
2020-08-19 07:19:47 +00:00
Bill Yi
69605d12d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I87be371a25573e769edbb80ed0817e02efb69cd5
2020-08-19 07:19:41 +00:00
Bill Yi
dc84153e81 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f9d903a21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46ef5ca050eb20176ce6783f3d4479b98823067b
2020-08-19 07:19:33 +00:00
Jason Hsu
cf21abf418 Merge "Fix checkbox in magnification mode dialog does not have ripple effect" am: f164cf8539
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369338

Change-Id: Icc0a14fe60c49fe621d0e48f61878ad7a5c87b2e
2020-08-19 05:15:44 +00:00
Jason Hsu
f164cf8539 Merge "Fix checkbox in magnification mode dialog does not have ripple effect" 2020-08-19 04:57:20 +00:00
Bill Yi
7f9d903a21 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
2020-08-18 21:53:23 -07:00