PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,453 Commits 1 Branch 0 Tags
1283a7b5cc561cdb78e4076e200facf86a0a8b2c
Commit Graph

93453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1283a7b5cc Merge changes from topic "presubmit-am-80d7e8eb36134b05b95efa3c845a7510" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a5930e87ef
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 21:05:09 +00:00
TreeHugger Robot
4491840393 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: c085a61fd0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I861dbca04028ff3da83a84a78d1fa800874e79a6
 2021-08-13 20:16:30 +00:00
Bill Yi
fb5d0a6e1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours am: 4d68983581 -s ours am: c303aa8b0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eb46287f907ebd73ced548aba065c36e3155d90
 2021-08-13 20:12:16 +00:00
TreeHugger Robot
e0b3c1d567 Merge "Increase character limit for translations" 2021-08-13 20:11:03 +00:00
Bill Yi
c303aa8b0c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours am: 4d68983581 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9b86bd0df673f2e41d41bce1934c37ded3a8141d
 2021-08-13 19:56:31 +00:00
Bill Yi
529dbba305 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 6201a4e960 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idfdbddc47453cf06b43481c29a1262991c7f9671
 2021-08-13 19:50:42 +00:00
TreeHugger Robot
fd30d1596f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa782b4578 -s ours am: e069033c61 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I52de5a02628e910ffcc9cda55ff3a476ddae7d02
 2021-08-13 19:39:04 +00:00
TreeHugger Robot
c085a61fd0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I608f72806c1a3d0e185b8601219a974d40b7d86f
 2021-08-13 19:31:55 +00:00
Bill Yi
6201a4e960 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia6105cd88e33d694007a838a9c0ea16429299e98
 2021-08-13 19:31:51 +00:00
TreeHugger Robot
e069033c61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa782b4578 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I45a563823b85397a1c6bccc7fec8311cbaa4e255
 2021-08-13 19:27:00 +00:00
TreeHugger Robot
d3a02937ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
 2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
 2021-08-13 19:17:59 +00:00
TreeHugger Robot
856bbc5b61 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: 33be7e6138 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb00aa6ad5e0d78a7a9a2edd51dd5875644ff699
 2021-08-13 19:15:32 +00:00
TreeHugger Robot
073d0b55c3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: e997850db8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2897f23fcd9c9ac883b69af191f1f531f08046a
 2021-08-13 19:15:26 +00:00
TreeHugger Robot
801748a9e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: b351f3d8b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2b737f829c256c7083294b9bf930eb5b6cd3a1f
 2021-08-13 19:13:01 +00:00
TreeHugger Robot
87a7ebe1d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 19:08:56 +00:00
TreeHugger Robot
33be7e6138 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica2a7ed4e2fef26f5759c7d03f5ed9edd7caf002
 2021-08-13 18:56:42 +00:00
TreeHugger Robot
e997850db8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1547edb01a1d748dc3fa16d4ce0639b259cc6a62
 2021-08-13 18:56:23 +00:00
TreeHugger Robot
b351f3d8b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id595e027bc0f7521f75cdab26eb25e4b500bcfeb
 2021-08-13 18:53:56 +00:00
TreeHugger Robot
17859087a3 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-mainline-prod am: 4ffb6a3802 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919

Change-Id: I642e5334e5219f1213d98fb95d5917ef9cc3b921
 2021-08-13 18:50:28 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
4ffb6a3802 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:50:16 +00:00
TreeHugger Robot
f93f6704cb Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 2p: 15ab7d0c6c
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:50:16 +00:00
TreeHugger Robot
580e257e70 Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-mainline-prod am: 0c9c334b1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913

Change-Id: Ib28749eb844c298868af9acecd7e935dcbd08c03
 2021-08-13 18:50:05 +00:00
TreeHugger Robot
3167dcf27c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-mainline-prod am: 8fc6977e1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901

Change-Id: I4791b12b054bacaab31b133879e8e23c96be6f22
 2021-08-13 18:49:54 +00:00
TreeHugger Robot
bacdfa0ca1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: dbb7ff17bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If8a3038ce8f6445b62cf2c1b243872f80846d16d
 2021-08-13 18:49:04 +00:00
TreeHugger Robot
19f9ff8508 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: b56e57822e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5b84bf33f8866c15b2c62f1d935687dba195e888
 2021-08-13 18:48:13 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
0c9c334b1c Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
TreeHugger Robot
a5f6998f93 Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 2p: 9dba803711
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
Bill Yi
1f7e29e922 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 325b0477ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia717ace4a44a1e8e77d676501620cd10a9a101fa
 2021-08-13 18:43:55 +00:00
TreeHugger Robot
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
TreeHugger Robot
8fc6977e1c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
TreeHugger Robot
df2b163ad3 Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 2p: 73ef004527
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
Bill Yi
4d68983581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cc31a337e002d9cddd3e5c42966a0059a0786c3
 2021-08-13 18:32:56 +00:00
TreeHugger Robot
dbb7ff17bb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-13 18:31:09 +00:00
TreeHugger Robot
8149a12b1a Merge changes from topic "presubmit-am-7d547a7b5cc74320bbbf62dfd4e87346" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 289ff0bec9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:31:09 +00:00
TreeHugger Robot
b56e57822e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If914be129437f95b93643e6a99d8cc2b85338ae5
 2021-08-13 18:21:42 +00:00
Bill Yi
325b0477ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id85c17d8f0f7dbd160a24ab8d9e08b9a8e617a33
 2021-08-13 18:21:27 +00:00
Bill Yi
e7eff15e83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9ba31d3695cdea83bbdbc505fee4ccfab6fc9faf
 2021-08-13 18:21:09 +00:00
TreeHugger Robot
cdc3f31562 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 18:15:24 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
 2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
 2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
TreeHugger Robot
fa782b4578 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:47:46 +00:00
TreeHugger Robot
c304ced072 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 17:38:56 +00:00
alinasuarez
118091fb1e Increase character limit for translations 
Translators need more than 40 characters for the subfactor translations.
This gives translators 2 lines for characters, making the character
limit 50. This still looks good with the UI.

Bug: 195773269
Bug: 195650506

Test: Visual
Change-Id: I13d395215780e0dc95bb27b2e6308a5affffae91
 2021-08-13 17:05:51 +00:00
Joshua Lewis
385d36ac2d Merge "Parse AM Constants to get keys:value for Dialog" 2021-08-13 16:46:31 +00:00
Ayush Sharma
8851afb8ff Merge "Remove refs of isSeparateProfileChallengeAllowed" 2021-08-13 15:49:11 +00:00
TreeHugger Robot
10cde2f003 Merge "Handle spanned conversation labels" into sc-qpr1-dev am: 1741d5d12c am: f1772f686b am: 58dcefef22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546623

Change-Id: Ib04c854d51e2c2ca0c625d98a092fef7b1b55603
 2021-08-13 15:36:30 +00:00