PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,514 Commits 1 Branch 0 Tags
aee17d0f0b6167ed89e550cf9ca1ef660df509a0
Commit Graph

70514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
aee17d0f0b Merge "Fix pending intent links" into rvc-qpr-dev am: 3e29b54e5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416202

Change-Id: Ia5b32ae76df267b8d08dd8947c02180ead620a78
 2020-08-24 16:04:05 +00:00
Julia Reynolds
3e29b54e5a Merge "Fix pending intent links" into rvc-qpr-dev 2020-08-24 15:07:13 +00:00
TreeHugger Robot
77cca92a65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: b3cbdbdffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30c5a364efcdf4f329e3859456d56cff07129c54
 2020-08-23 03:26:24 +00:00
TreeHugger Robot
a50b560a44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: a8bd2b7a82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cca8660402368915a6e92f547a549291b85b269
 2020-08-23 03:26:10 +00:00
TreeHugger Robot
b3cbdbdffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I588be9bdc7fc5a367d0de98dd17dfac9c01c3a3a
 2020-08-23 03:10:45 +00:00
TreeHugger Robot
a8bd2b7a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7505c1bd6a8af76501f6c89738d02973d2a9f13e
 2020-08-23 02:58:59 +00:00
TreeHugger Robot
66239bfaa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 02:35:15 +00:00
Bill Yi
ad6b207d87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 7f0716a65e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec8ca804446bb6ecc5884d37e6221d0264a25ca
 2020-08-22 15:47:24 +00:00
Bill Yi
8b9b113e75 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 4cd2078e50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I939ae8ad54bbf7aef5a838bbfbdb5e5da72b6a8d
 2020-08-22 15:47:12 +00:00
Bill Yi
7f0716a65e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52f65ae9ceb348cb155740f03575c83964cd8a11
 2020-08-22 15:33:42 +00:00
Bill Yi
4cd2078e50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie984a3ec13fe9bf2b0db635fc95c4688992189f6
 2020-08-22 15:33:31 +00:00
Bill Yi
6923a98c64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I62e56f374302ccd788ccef846a68fe136959bfb7
 2020-08-22 08:26:30 -07:00
Bill Yi
fa9f63d87c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfbfa807 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I04b9672d3b6a7f208ceee93083b63d3a7151e36c
 2020-08-22 14:56:43 +00:00
Bill Yi
f5cfbfa807 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ae32e1fd822610d63b904c1ce8f5acba3cb7db4
 2020-08-22 13:33:28 +00:00
Bill Yi
493440b39d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6a784d62bc3bd3e542e61adb4d7871ee7da49bd4
 2020-08-22 12:52:45 +00:00
Bill Yi
7504a741b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours am: 24a85bad6d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I502b167142709029b3f055ac290b026a543132e4
 2020-08-20 17:03:43 +00:00
Bill Yi
f37f5ff375 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours am: 42d1d98806 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74da61f4e782312a8dbb2adadd55f067d8d1a2f1
 2020-08-20 17:03:31 +00:00
Bill Yi
42d1d98806 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c82e4f6596bdfee0c15672ac72de469b43faab0
 2020-08-20 16:32:49 +00:00
Bill Yi
24a85bad6d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5739e1f877 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59b03c55a034cd781711e87a7898644c39fe271
 2020-08-20 16:32:38 +00:00
Bill Yi
5739e1f877 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1c8c87022237f2cc8b4b5a4623756ddf2f2a3764
 2020-08-20 07:46:11 -07:00
Julia Reynolds
4cf561d2c3 Fix pending intent links 
Test: manual
Fixes: 154795795
Change-Id: Ia870bd0bfd90be852121b542100806cac5bac881
(cherry picked from commit 97894bcfb7)
 2020-08-20 12:38:37 +00:00
TreeHugger Robot
f0e3970e0b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: c6020bf4dc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0d67aa96be4214c96c075781a91c7ec8beec7304
 2020-08-20 00:44:38 +00:00
TreeHugger Robot
c1ea758688 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours am: 74da04187c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a16d82c86f5f17573b88a1d92799c9c62eede0a
 2020-08-20 00:44:13 +00:00
TreeHugger Robot
c6020bf4dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id81057446689d4c1874d17f582f7738aaa62b180
 2020-08-20 00:33:05 +00:00
TreeHugger Robot
74da04187c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 4b4b2b29fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0536955a70b5e28da3c36b8e268bb65c746e5d1
 2020-08-20 00:33:00 +00:00
TreeHugger Robot
4b4b2b29fa Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-20 00:15:12 +00:00
Bill Yi
5f549433a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe77ec8b7ad9f52fe7b5fc7514fe7eab0bf02f6a
 2020-08-19 23:23:41 +00:00
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
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
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
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
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
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
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