Kaydet (Commit) b5e6c7d2 authored tarafından Michael Meeks's avatar Michael Meeks

fdo#60604 - tag notes text as UTF-8.

Change-Id: I535cdae8c742e5b260d73bd000f9354cfe04b854
üst b3c81cb3
...@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment { ...@@ -100,7 +100,7 @@ public class PresentationFragment extends SherlockFragment {
mNotes = (WebView) v.findViewById(R.id.presentation_notes); mNotes = (WebView) v.findViewById(R.id.presentation_notes);
String summary = "<html><body>This is just a test<br/><ul><li>And item</li><li>And again</li></ul>More text<br/>Blabla<br/>Blabla<br/>blabla<br/>Blabla</body></html>"; String summary = "<html><body>This is just a test<br/><ul><li>And item</li><li>And again</li></ul>More text<br/>Blabla<br/>Blabla<br/>blabla<br/>Blabla</body></html>";
mNotes.loadData(summary, "text/html", null); mNotes.loadData(summary, "text/html", "UTF-8");
mNotes.setBackgroundColor(Color.TRANSPARENT); mNotes.setBackgroundColor(Color.TRANSPARENT);
mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow); mTopView = (CoverFlow) v.findViewById(R.id.presentation_coverflow);
...@@ -157,7 +157,7 @@ public class PresentationFragment extends SherlockFragment { ...@@ -157,7 +157,7 @@ public class PresentationFragment extends SherlockFragment {
mNumberText.setText((aPosition + 1) + "/" mNumberText.setText((aPosition + 1) + "/"
+ mCommunicationService.getSlideShow().getSize()); + mCommunicationService.getSlideShow().getSize());
mNotes.loadData(mCommunicationService.getSlideShow() mNotes.loadData(mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", null); .getNotes(aPosition), "text/html", "UTF-8");
} }
// -------------------------------------------------- RESIZING LISTENER ---- // -------------------------------------------------- RESIZING LISTENER ----
...@@ -282,7 +282,7 @@ public class PresentationFragment extends SherlockFragment { ...@@ -282,7 +282,7 @@ public class PresentationFragment extends SherlockFragment {
int aPosition = aIntent.getExtras().getInt("slide_number"); int aPosition = aIntent.getExtras().getInt("slide_number");
if ( aPosition == mTopView.getSelectedItemPosition() ) { if ( aPosition == mTopView.getSelectedItemPosition() ) {
mNotes.loadData(mCommunicationService.getSlideShow() mNotes.loadData(mCommunicationService.getSlideShow()
.getNotes(aPosition), "text/html", null); .getNotes(aPosition), "text/html", "UTF-8");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment