PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,904 Commits 1 Branch 0 Tags
2459ffecfb7eeda49411e0cbf54603c696ca313c
Commit Graph

65904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Ebinger
2459ffecfb [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours am: 8c2de745c6 -s ours am: eca5c02f71 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: If1a0173f38f894c886e773e892cd355ce370a060
 2020-04-20 22:37:43 +00:00
Brad Ebinger
eca5c02f71 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours am: 8c2de745c6 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: I626f961a2f73d934273a652eafc5a64c8297b99b
 2020-04-20 22:18:06 +00:00
Brad Ebinger
8c2de745c6 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours am: 52cb98cac1 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: Ib0fe0c5400d3c4209bbbbedb013d3d918c2259cb
 2020-04-20 21:52:44 +00:00
Brad Ebinger
52cb98cac1 [automerger skipped] Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 am: 2c60eb8851 -s ours 
am skip reason: Change-Id Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c with SHA-1 95aeac6790 is in history

Change-Id: Iade0e884c0b5e98704e6892b1cbbd66b0d3d9c36
 2020-04-20 21:29:23 +00:00
Brad Ebinger
2c60eb8851 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." am: a9295ea648 
Change-Id: I1d6e0324ee8db02a75e3f14ebfe24fad369b0bd2
 2020-04-20 21:04:14 +00:00
Xiangyu/Malcolm Chen
9c3d1a0073 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 am: 791b99a6fe am: 047ca2c76f 
Change-Id: I407be41eaf20f212b5fa899ba974a4c2e32cee3d
 2020-04-20 20:43:35 +00:00
Xiangyu/Malcolm Chen
4d7c1b45ad Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 am: 0ab56379e4 am: 9dd603451b 
Change-Id: I043570030a54a6b96871363179287caad9e20851
 2020-04-20 20:41:57 +00:00
Xiangyu/Malcolm Chen
fdb2d434ff Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c am: 4d35849139 
Change-Id: Ibefe3cd3e37ebe3ae3f1b5f5d7044d50fd9d7e53
 2020-04-20 20:40:32 +00:00
Brad Ebinger
a9295ea648 Merge "Set the CHAR_LIMIT to 110 in order to support more translations." 2020-04-20 20:40:02 +00:00
Xiangyu/Malcolm Chen
047ca2c76f Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 am: 791b99a6fe 
Change-Id: I8d45001f7acdebcd16c91b718185ae68f0aca78a
 2020-04-20 20:37:09 +00:00
Xiangyu/Malcolm Chen
9dd603451b Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 am: 0ab56379e4 
Change-Id: Idf6b0dfe42d0f2037d1440b8fd34d0b314bab891
 2020-04-20 20:13:03 +00:00
Xiangyu/Malcolm Chen
791b99a6fe Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: db0a05c926 
Change-Id: Icaaf82055dae2b1ba4f37253e61b721b76d5cfec
 2020-04-20 20:12:35 +00:00
Xiangyu/Malcolm Chen
4d35849139 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 am: d781fe860c 
Change-Id: Ibfadbaaebf3278f6916e5ce6d14d4f112eee6aea
 2020-04-20 20:12:13 +00:00
Xiangyu/Malcolm Chen
0ab56379e4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: f181589b71 
Change-Id: I1b08ab7479a81efef8b5adb72a78385cff83a4c6
 2020-04-20 19:49:33 +00:00
Xiangyu/Malcolm Chen
db0a05c926 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 
Change-Id: I62475cd44c69f04227a3e5e56de343fef675242c
 2020-04-20 19:49:05 +00:00
Xiangyu/Malcolm Chen
d781fe860c Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 am: 8ca377ffd4 
Change-Id: Iadec916a916cfc93147c68fa243a5f21f346dabe
 2020-04-20 19:47:57 +00:00
Xiangyu/Malcolm Chen
f181589b71 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 
Change-Id: I2e35616ac335cfb257d2de74ac83582f3b6019fb
 2020-04-20 19:28:16 +00:00
Xiangyu/Malcolm Chen
8ca377ffd4 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev am: 9674276bb5 
Change-Id: Ia9defd6ddcc917f333568fef33f093eb024e6eb2
 2020-04-20 19:27:12 +00:00
Xiangyu/Malcolm Chen
9674276bb5 Merge "Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter" into rvc-dev 2020-04-20 19:10:15 +00:00
Brad Ebinger
6b87fa6705 Set the CHAR_LIMIT to 110 in order to support more translations. 
Increase the CHAR_LIMIT for contact_discovery_opt_in_summary.

Fixes: 153376000
Fixes: 150941009
Test: manual
Merged-In: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
Change-Id: Ia71c87b47ed8b5b738f6d5a9b2693e7943f6797c
 2020-04-20 12:08:58 -07:00
Julia Reynolds
ce93ad0262 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d1cd33c72b am: 2ae4ad8242 am: 39f6bfe732 
Change-Id: Ief6f0b4f53e2098cd5f17befedc7ed8d352da0a0
 2020-04-20 18:55:13 +00:00
Julia Reynolds
39f6bfe732 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d1cd33c72b am: 2ae4ad8242 
Change-Id: Ic8bfab5ade5644d83445f3b2f6a3d896d8db2c80
 2020-04-20 18:46:26 +00:00
Julia Reynolds
a37182deae Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 44aed00a26 am: c525f2793d am: 2197b1c22e 
Change-Id: Ifdefeddc96b00f26bc8bd70cfebb59256253410b
 2020-04-20 18:45:44 +00:00
Julia Reynolds
47f216d234 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d81714214b am: f4dabba6e3 
Change-Id: Id3e85b99c55e7de2990e66804b22616c93ad5161
 2020-04-20 18:45:12 +00:00
Julia Reynolds
2197b1c22e Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 44aed00a26 am: c525f2793d 
Change-Id: Ib96d040d912f6a04a5b13c2a722b054373f36b49
 2020-04-20 18:28:55 +00:00
Julia Reynolds
f4dabba6e3 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d81714214b 
Change-Id: Icadd6c0b4ded5e1605e5df0978569eeaa1523de9
 2020-04-20 18:28:12 +00:00
Julia Reynolds
2ae4ad8242 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e am: d1cd33c72b 
Change-Id: If0058e1c3c25bb1da0b41cd5fd2b8531dc444495
 2020-04-20 18:27:57 +00:00
Julia Reynolds
c525f2793d Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 44aed00a26 
Change-Id: Ib7fd90c499aff7ecdfb8a6382cc8ae216ae1160c
 2020-04-20 18:13:35 +00:00
Julia Reynolds
d1cd33c72b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e 
Change-Id: Iaf430693d977ba185c5241558d444bb581227196
 2020-04-20 18:13:07 +00:00
jasonwshsu
91f3b2748f Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb am: cfda3179a6 am: 5effcb5598 
Change-Id: I0e5f51268710e8df87618c12cbb9c62d7f17d3f2
 2020-04-20 18:12:11 +00:00
Julia Reynolds
d81714214b Merge "Set explicit back target for history" into rvc-dev am: bb979153ed am: 4fa251613e 
Change-Id: I8e5a6417cf5ac57faa0e8378d41d0e65ea1b95b4
 2020-04-20 18:11:50 +00:00
Julia Reynolds
44aed00a26 Merge "Set explicit back target for history" into rvc-dev am: bb979153ed 
Change-Id: Ic0b76edf0c67693ac0563ce1b8bdc0f69ffcf17e
 2020-04-20 17:54:44 +00:00
jasonwshsu
5effcb5598 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb am: cfda3179a6 
Change-Id: I72a8aa23c024e1a39853a9418f21eb19e1d66cdd
 2020-04-20 17:54:35 +00:00
Julia Reynolds
4fa251613e Merge "Set explicit back target for history" into rvc-dev am: bb979153ed 
Change-Id: I2c81ca3114f44cab401b7f698cde7ae5481b8ebb
 2020-04-20 17:53:22 +00:00
jasonwshsu
aae6ffde1a Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: 615a2398fe am: 9af05c5c23 am: e37e426cc0 
Change-Id: I435c253ae731af77336a4efda209aa2b9ec56fb6
 2020-04-20 17:43:36 +00:00
jasonwshsu
b59175a5a3 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 am: 86125faa38 
Change-Id: I2b40e454750f7a6d62696b30a9e4fc96133882d4
 2020-04-20 17:43:01 +00:00
Julia Reynolds
bb979153ed Merge "Set explicit back target for history" into rvc-dev 2020-04-20 17:40:18 +00:00
jasonwshsu
cfda3179a6 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: 67dea59aeb 
Change-Id: I1436f461c510965b401b8e221af6fb0a22e08cda
 2020-04-20 17:28:46 +00:00
jasonwshsu
e37e426cc0 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: 615a2398fe am: 9af05c5c23 
Change-Id: I56ac674b4c036263e36c8d3aa1d515f6aba1b4c4
 2020-04-20 17:28:18 +00:00
jasonwshsu
86125faa38 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 am: b25cd33e39 
Change-Id: I8e53f67acc53c97a7b5a7d006b104f28f595410c
 2020-04-20 17:27:05 +00:00
jasonwshsu
9af05c5c23 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: 615a2398fe 
Change-Id: I9a65264827c4261c29f59ea2e0fd039ba6bcf999
 2020-04-20 17:03:52 +00:00
jasonwshsu
67dea59aeb Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: Ie414f5b0ea32101371327845853c330eb297e12c
 2020-04-20 17:03:31 +00:00
jasonwshsu
b25cd33e39 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 am: e7766cc455 
Change-Id: I833a26326c9c30269ee07eab6fe9ba58ffceaa00
 2020-04-20 17:02:56 +00:00
jasonwshsu
615a2398fe Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 
Change-Id: Ia03258348afbbdf9549c1fadd4038be75ced45c0
 2020-04-20 16:44:31 +00:00
jasonwshsu
e7766cc455 Remove unused attribute 'EXTRA_SUMMARY_RES' am: 1be2666d11 
Change-Id: I711b86a69ef33f24fa8dc1e175e3cb8c6741532b
 2020-04-20 16:43:22 +00:00
Julia Reynolds
6c8451a89f Set explicit back target for history 
Test: manual
Fixes: 153554906
Change-Id: Ic3198afae878e3cfbfbfa7e72b1c71a6f4e74a2e
 2020-04-20 11:31:43 -04:00
jasonwshsu
1be2666d11 Remove unused attribute 'EXTRA_SUMMARY_RES' 
* Magnification already use EXTRA_HTML_DESCRIPTION to replace it.

Bug: 154092127
Test: manual test
Change-Id: I5385907eb0911894159a80444493bf233bb43e1a
 2020-04-20 23:09:59 +08:00
Julia Reynolds
a519e7448f Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 181a657080 am: 59c64fefc0 am: f941055c1d 
Change-Id: I566a00ef478fee01920549f84add866912a513f7
 2020-04-20 14:55:54 +00:00
Julia Reynolds
f941055c1d Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: a8bb57287c am: 181a657080 am: 59c64fefc0 
Change-Id: I41387d9552a4d2c74473abedb8f323934e568cb1
 2020-04-20 14:47:11 +00:00
Julia Reynolds
efe1ebae5d Merge "Update conversation bubble settings" into rvc-dev am: 608bd69328 am: 7f486ec9d7 am: 5fdf4bbfd8 am: ce9b6157d7 
Change-Id: I2eb35123556042fc5c27971c6db3719e47c60b19
 2020-04-20 14:45:47 +00:00