diff options
author | uabdullah <uabdullah@google.com> | 2018-06-20 12:48:06 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-20 12:48:06 -0700 |
commit | 8a58085aa08bcf7c820e374e433ee27b1a2768dc (patch) | |
tree | 049cbf7b3b433da7463f9bdfe89db3cc823a900e | |
parent | eb00e72779cc50ccead75aeb83f051483ed427a7 (diff) | |
parent | 17210bbca7c46185e097e7cc9ff05a8bdb629a0a (diff) |
Merge "Update settings" am: 6125ea192e
am: 17210bbca7
Change-Id: I7379b07905701a03a37df31c4f648501c60cc433
-rw-r--r-- | java/com/android/incallui/speakeasy/SpeakEasyComponent.java | 4 | ||||
-rw-r--r-- | java/com/android/incallui/speakeasy/StubSpeakEasyModule.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java index 5d536321d..422ebd6da 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 class SpeakEasyComponent { 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 bab52ffcb..5441075ef 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 @@ public abstract class StubSpeakEasyModule { abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub); @Provides - static @SpeakEasySettingsActivity Optional<AppCompatActivity> provideSpeakEasySettingsActivity() { + static @SpeakEasySettingsActivity Optional<PreferenceActivity> + provideSpeakEasySettingsActivity() { return Optional.absent(); } |