diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-06-08 00:59:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-08 00:59:55 +0000 |
| commit | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (patch) | |
| tree | b9bbc285430ffb5363a70eb27e382c38f5a85b7a /java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java | |
| parent | 75233ff03785f24789b32039ac2c208805b7e506 (diff) | |
| parent | 274b6d320edb3c33e7b3a95c43a811829486a777 (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47
am: 274b6d320e
Change-Id: Iecf4325f314bf6c3324187e6406c8aae4675dd63
Diffstat (limited to 'java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java')
| -rw-r--r-- | java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java index 2c464386b..e8e425626 100644 --- a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java +++ b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java @@ -18,7 +18,6 @@ package com.android.dialer.app.settings; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; -import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatDelegate; import android.support.v7.widget.Toolbar; import android.view.MenuInflater; @@ -49,10 +48,6 @@ public class AppCompatPreferenceActivity extends PreferenceActivity { getDelegate().onPostCreate(savedInstanceState); } - public ActionBar getSupportActionBar() { - return getDelegate().getSupportActionBar(); - } - public void setSupportActionBar(Toolbar toolbar) { getDelegate().setSupportActionBar(toolbar); } |