diff options
Diffstat (limited to 'java/com/android/incallui/speakeasy')
3 files changed, 8 insertions, 21 deletions
diff --git a/java/com/android/incallui/speakeasy/Annotations.java b/java/com/android/incallui/speakeasy/Annotations.java index 5d513fc9b..4128532c3 100644 --- a/java/com/android/incallui/speakeasy/Annotations.java +++ b/java/com/android/incallui/speakeasy/Annotations.java @@ -21,14 +21,6 @@ import javax.inject.Qualifier; /** Annotations for Speakeasy providers. */ public final class Annotations { - /** A Speakeasy icon */ - @Qualifier - public @interface SpeakEasyIcon {} - - /** Speakeasy text */ - @Qualifier - public @interface SpeakEasyText {} - /** A Speakeasy settings fragment */ @Qualifier public @interface SpeakEasySettingsFragment {} @@ -36,4 +28,8 @@ public final class Annotations { /** A Speakeasy settings object */ @Qualifier public @interface SpeakEasySettingsObject {} + + /** A Speakeasy chip */ + @Qualifier + public @interface SpeakEasyChipResourceId {} } diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java index ab6438077..19e25edbe 100644 --- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java +++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java @@ -19,10 +19,9 @@ package com.android.incallui.speakeasy; import android.content.Context; import android.preference.PreferenceFragment; import com.android.dialer.inject.HasRootComponent; -import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon; +import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject; -import com.android.incallui.speakeasy.Annotations.SpeakEasyText; import com.google.common.base.Optional; import dagger.Subcomponent; @@ -37,9 +36,7 @@ public abstract class SpeakEasyComponent { public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject(); - public abstract @SpeakEasyIcon Optional<Integer> speakEasyIcon(); - - public abstract @SpeakEasyText Optional<Integer> speakEasyText(); + public abstract @SpeakEasyChipResourceId Optional<Integer> speakEasyChip(); public static SpeakEasyComponent get(Context context) { return ((SpeakEasyComponent.HasComponent) diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java index e844ad348..87d407d32 100644 --- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java +++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java @@ -19,10 +19,9 @@ package com.android.incallui.speakeasy; import android.preference.PreferenceFragment; import com.android.dialer.inject.DialerVariant; import com.android.dialer.inject.InstallIn; -import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon; +import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject; -import com.android.incallui.speakeasy.Annotations.SpeakEasyText; import com.google.common.base.Optional; import dagger.Binds; import dagger.Module; @@ -48,12 +47,7 @@ public abstract class StubSpeakEasyModule { } @Provides - static @SpeakEasyIcon Optional<Integer> provideSpeakEasyIcon() { - return Optional.absent(); - } - - @Provides - static @SpeakEasyText Optional<Integer> provideSpeakEasyText() { + static @SpeakEasyChipResourceId Optional<Integer> provideSpeakEasyChip() { return Optional.absent(); } } |