commit 27c84de32575b1d118aae6e8fb0f353a4f873ec1
author tmfang <tmfang@google.com> Thu Jun 28 11:39:05 2018 +0800
committer Fan Zhang <zhfan@google.com> Wed Jul 11 18:24:51 2018 -0700
tree 3e3ed93154cfb6757fd736dfbd3009336869c35c
parent 99cc23d0dab22f8c318d9103adb507955f458bf3

Settings Fragment Migration (Build pass app)

This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b

src/com/android/settings/SettingsLicenseActivity.java

diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index d3c3b48..c1bf9e5 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.settings;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Intent;
@@ -28,19 +27,20 @@
 import android.widget.Toast;
 
 import com.android.settings.users.RestrictedProfileSettings;
-import com.android.settingslib.license.LicenseHtmlLoader;
+import com.android.settingslib.license.LicenseHtmlLoaderCompat;
 
 import java.io.File;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.core.content.FileProvider;
+import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
 /**
  * The "dialog" that shows from "License" in the Settings app.
  */
-public class SettingsLicenseActivity extends Activity implements
+public class SettingsLicenseActivity extends FragmentActivity implements
             LoaderManager.LoaderCallbacks<File> {
     private static final String TAG = "SettingsLicenseActivity";
 
@@ -64,7 +64,7 @@
 
     @Override
     public Loader<File> onCreateLoader(int id, Bundle args) {
-        return new LicenseHtmlLoader(this);
+        return new LicenseHtmlLoaderCompat(this);
     }
 
     @Override
@@ -77,7 +77,7 @@
     }
 
     private void showHtmlFromDefaultXmlFiles() {
-        getLoaderManager().initLoader(LOADER_ID_LICENSE_HTML_LOADER, Bundle.EMPTY, this);
+        getSupportLoaderManager().initLoader(LOADER_ID_LICENSE_HTML_LOADER, Bundle.EMPTY, this);
     }
 
     @VisibleForTesting