Merge "Update settings"
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
index 5d53632..422ebd6 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
@@ -17,7 +17,7 @@
package com.android.incallui.speakeasy;
import android.content.Context;
-import android.support.v7.app.AppCompatActivity;
+import android.preference.PreferenceActivity;
import com.android.dialer.inject.HasRootComponent;
import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity;
@@ -38,7 +38,7 @@
public abstract SpeakEasyCallManager speakEasyCallManager();
- public abstract @SpeakEasySettingsActivity Optional<AppCompatActivity>
+ public abstract @SpeakEasySettingsActivity Optional<PreferenceActivity>
speakEasySettingsActivity();
public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject();
diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
index bab52ff..5441075 100644
--- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
+++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
@@ -16,7 +16,7 @@
package com.android.incallui.speakeasy;
-import android.support.v7.app.AppCompatActivity;
+import android.preference.PreferenceActivity;
import com.android.dialer.inject.DialerVariant;
import com.android.dialer.inject.InstallIn;
import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
@@ -37,7 +37,8 @@
abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);
@Provides
- static @SpeakEasySettingsActivity Optional<AppCompatActivity> provideSpeakEasySettingsActivity() {
+ static @SpeakEasySettingsActivity Optional<PreferenceActivity>
+ provideSpeakEasySettingsActivity() {
return Optional.absent();
}