From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- .../com/android/dialer/app/settings/AppCompatPreferenceActivity.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java') diff --git a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java index e8e425626..2c464386b 100644 --- a/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java +++ b/java/com/android/dialer/app/settings/AppCompatPreferenceActivity.java @@ -18,6 +18,7 @@ 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; @@ -48,6 +49,10 @@ public class AppCompatPreferenceActivity extends PreferenceActivity { getDelegate().onPostCreate(savedInstanceState); } + public ActionBar getSupportActionBar() { + return getDelegate().getSupportActionBar(); + } + public void setSupportActionBar(Toolbar toolbar) { getDelegate().setSupportActionBar(toolbar); } -- cgit v1.2.3