diff options
| author | Aurimas Liutikas <aurimas@google.com> | 2017-06-01 22:46:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-01 22:46:58 +0000 |
| commit | 141883f160ab0670f7f04a8f0dc70a8135c723c3 (patch) | |
| tree | 5a2b6df3ec5c90c75f8e55aedf9859cf1bfa7022 | |
| parent | ae06b1b3b86fcaffde9f94171bbb2b5649a95f14 (diff) | |
| parent | 28d5e3ca4af13e1ff091c7b4c81b15c07484dfe3 (diff) | |
| download | android_packages_apps_Dialer-141883f160ab0670f7f04a8f0dc70a8135c723c3.tar.gz android_packages_apps_Dialer-141883f160ab0670f7f04a8f0dc70a8135c723c3.tar.bz2 android_packages_apps_Dialer-141883f160ab0670f7f04a8f0dc70a8135c723c3.zip | |
Merge "Remove usages of ActionBarActivity." into oc-dev
am: 28d5e3ca4a
Change-Id: Ic4912b727886f3e9a24f6e4a88ab433b57c19057
| -rw-r--r-- | java/com/android/dialer/about/LicenseActivity.java | 4 | ||||
| -rw-r--r-- | java/com/android/dialer/about/LicenseMenuActivity.java | 4 |
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"; |