From 0509a47f6ae36fcf40c04bc5b5927cade4c8709b Mon Sep 17 00:00:00 2001 From: uabdullah Date: Wed, 20 Jun 2018 10:55:24 -0700 Subject: Update settings Bug: 109890761,73736474,73737524,73773935,79701706 Test: Unit Test PiperOrigin-RevId: 201379249 Change-Id: I0a18adc4c8df33c65e81281928508897679b5994 --- java/com/android/incallui/speakeasy/SpeakEasyComponent.java | 4 ++-- java/com/android/incallui/speakeasy/StubSpeakEasyModule.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'java/com/android/incallui') 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 + public abstract @SpeakEasySettingsActivity Optional speakEasySettingsActivity(); public abstract @SpeakEasySettingsObject Optional 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 provideSpeakEasySettingsActivity() { + static @SpeakEasySettingsActivity Optional + provideSpeakEasySettingsActivity() { return Optional.absent(); } -- cgit v1.2.3