summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-01 22:34:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-01 22:34:50 +0000
commit28d5e3ca4af13e1ff091c7b4c81b15c07484dfe3 (patch)
treef4518f2fb97824e0587c890f8a94892955ed3ef4
parent83b20211c3be04a850de3674977deee8e448d17f (diff)
parent6105b6a538a31541850d94d81fe6a59e98f00a80 (diff)
downloadandroid_packages_apps_Dialer-28d5e3ca4af13e1ff091c7b4c81b15c07484dfe3.tar.gz
android_packages_apps_Dialer-28d5e3ca4af13e1ff091c7b4c81b15c07484dfe3.tar.bz2
android_packages_apps_Dialer-28d5e3ca4af13e1ff091c7b4c81b15c07484dfe3.zip
Merge "Remove usages of ActionBarActivity." into oc-dev
-rw-r--r--java/com/android/dialer/about/LicenseActivity.java4
-rw-r--r--java/com/android/dialer/about/LicenseMenuActivity.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/java/com/android/dialer/about/LicenseActivity.java b/java/com/android/dialer/about/LicenseActivity.java
index 24822235f..3cb7540e6 100644
--- a/java/com/android/dialer/about/LicenseActivity.java
+++ b/java/com/android/dialer/about/LicenseActivity.java
@@ -17,13 +17,13 @@
package com.android.dialer.about;
import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.ScrollView;
import android.widget.TextView;
/** Simple Activity that renders locally stored open source legal info in a text view. */
-public final class LicenseActivity extends ActionBarActivity {
+public final class LicenseActivity extends AppCompatActivity {
private static final String TAG = "LicenseActivity";
private static final String STATE_SCROLL_POS = "scroll_pos";
diff --git a/java/com/android/dialer/about/LicenseMenuActivity.java b/java/com/android/dialer/about/LicenseMenuActivity.java
index 73047989c..f609d07d7 100644
--- a/java/com/android/dialer/about/LicenseMenuActivity.java
+++ b/java/com/android/dialer/about/LicenseMenuActivity.java
@@ -20,7 +20,7 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.Loader;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
@@ -31,7 +31,7 @@ import java.util.ArrayList;
import java.util.List;
/** An Activity listing third party libraries with notice licenses. */
-public final class LicenseMenuActivity extends ActionBarActivity
+public final class LicenseMenuActivity extends AppCompatActivity
implements LoaderCallbacks<List<License>> {
static final String ARGS_LICENSE = "license";