Move codes generating html file from xml files to SettingsLib (1/2)
LicenseHtmlGeneratorFromXml, LicenseHtmlLoader and indirecly AsyncLoader
shoud be commonly used by Settings and TvSettings.
So this CL will move them to SettingsLib.
Test: building succeeded and tested on sailfish.
make ROBOTEST_FILTER=SettingsLicenseActivityTest RunSettingsRoboTests
Change-Id: I12e9169b1d3d313a6c5da0d575a6526327268381
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index 5b23a68..ebb1ae1 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -20,12 +20,10 @@
import android.app.LoaderManager;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
-import android.content.Context;
import android.content.Intent;
import android.content.Loader;
import android.net.Uri;
import android.os.Bundle;
-import android.os.StrictMode;
import android.os.SystemProperties;
import android.support.annotation.VisibleForTesting;
import android.support.v4.content.FileProvider;
@@ -34,10 +32,9 @@
import android.widget.Toast;
import com.android.settings.users.RestrictedProfileSettings;
+import com.android.settingslib.license.LicenseHtmlLoader;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
/**
* The "dialog" that shows from "License" in the Settings app.
@@ -111,9 +108,9 @@
return;
}
showHtmlFromUri(Uri.fromFile(file));
- }
+ }
- private void showHtmlFromUri(Uri uri) {
+ private void showHtmlFromUri(Uri uri) {
// Kick off external viewer due to WebView security restrictions; we
// carefully point it at HTMLViewer, since it offers to decompress
// before viewing.