commit 6125ea192e3abf09024dcc272502ab751399fb58
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 20 19:36:57 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 20 19:36:57 2018 +0000
tree e5bdbe4da07845f4fde2ba1ed858c4cfaf9fa75c
parent 87f4ca065933bf1f4d6ce084796b06c37fedfd14
parent 0509a47f6ae36fcf40c04bc5b5927cade4c8709b

Merge "Update settings"

java/com/android/incallui/speakeasy/SpeakEasyComponent.java

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();

java/com/android/incallui/speakeasy/StubSpeakEasyModule.java

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();
   }