commit 94fc608ccc523c6b0c2003a5f6538d74f87c4e29
author Wenyi Wang <wenyiw@google.com> Thu Nov 17 23:50:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 17 23:50:38 2016 +0000
tree a0569465c3d93a1b5e7b6491ff87d297e5901a13
parent 6bf0dc0a6aecb3a96c6e16598f1a94d5e9afe8a4
parent ca4e13329e7331721e7cee8e5bdb6917a9f06bc0

Merge "Make LicenseActivity app compat" into ub-contactsdialer-h-dev

src/com/android/contacts/common/activity/LicenseActivity.java

diff --git a/src/com/android/contacts/common/activity/LicenseActivity.java b/src/com/android/contacts/common/activity/LicenseActivity.java
index 71bcd84..9e86ee8 100644
--- a/src/com/android/contacts/common/activity/LicenseActivity.java
+++ b/src/com/android/contacts/common/activity/LicenseActivity.java
@@ -17,8 +17,8 @@
 
 import com.android.contacts.common.R;
 
-import android.app.ActionBar;
-import android.app.Activity;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.webkit.WebView;
@@ -26,7 +26,7 @@
 /**
  * Displays the licenses for all open source libraries.
  */
-public class LicenseActivity extends Activity {
+public class LicenseActivity extends AppCompatActivity {
     private static final String LICENSE_FILE = "file:///android_asset/licenses.html";
     private WebView mWebView;
 
@@ -36,7 +36,7 @@
         setContentView(R.layout.licenses);
         mWebView = (WebView) findViewById(R.id.webview);
         mWebView.loadUrl(LICENSE_FILE);
-        final ActionBar actionBar = getActionBar();
+        final ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
         }