Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/org/adblockplus/android/AboutDialog.java

Issue 5662276015095808: Issue 1540 - Utility method for loading text is at the wrong location (Closed)
Patch Set: Created Nov. 6, 2014, 1:06 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 info.append("</h3>"); 64 info.append("</h3>");
65 info.append("<p>"); 65 info.append("<p>");
66 info.append(context.getString(R.string.version)); 66 info.append(context.getString(R.string.version));
67 info.append(": "); 67 info.append(": ");
68 info.append(versionName); 68 info.append(versionName);
69 info.append(" "); 69 info.append(" ");
70 info.append(context.getString(R.string.build)); 70 info.append(context.getString(R.string.build));
71 info.append(" "); 71 info.append(" ");
72 info.append(versionCode); 72 info.append(versionCode);
73 info.append("</p>"); 73 info.append("</p>");
74 AdblockPlus.appendRawTextFile(context, info, R.raw.info); 74 Utils.appendRawTextFile(context, info, R.raw.info);
75 AdblockPlus.appendRawTextFile(context, info, R.raw.legal); 75 Utils.appendRawTextFile(context, info, R.raw.legal);
76 76
77 // Show text 77 // Show text
78 final TextView tv = (TextView) findViewById(R.id.about_text); 78 final TextView tv = (TextView) findViewById(R.id.about_text);
79 tv.setText(Html.fromHtml(info.toString())); 79 tv.setText(Html.fromHtml(info.toString()));
80 tv.setMovementMethod(LinkMovementMethod.getInstance()); 80 tv.setMovementMethod(LinkMovementMethod.getInstance());
81 } 81 }
82 } 82 }
OLDNEW
« no previous file with comments | « no previous file | src/org/adblockplus/android/AdblockPlus.java » ('j') | src/org/adblockplus/android/Utils.java » ('J')

Powered by Google App Engine
This is Rietveld