diff options
Diffstat (limited to 'java/com/android/incallui/speakeasy')
3 files changed, 13 insertions, 14 deletions
diff --git a/java/com/android/incallui/speakeasy/Annotations.java b/java/com/android/incallui/speakeasy/Annotations.java index c66fe94c3..0d420a457 100644 --- a/java/com/android/incallui/speakeasy/Annotations.java +++ b/java/com/android/incallui/speakeasy/Annotations.java @@ -29,9 +29,9 @@ public final class Annotations { @Qualifier public @interface SpeakEasySettingsObject {} - /** A Speakeasy chip */ + /** A Speakeasy icon resource */ @Qualifier - public @interface SpeakEasyChipResourceId {} + public @interface SpeakEasyIconResourceId {} /** A Speakeasy text resource */ @Qualifier diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java index 422ebd6da..84a21f3d1 100644 --- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java +++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java @@ -19,20 +19,19 @@ package com.android.incallui.speakeasy; import android.content.Context; import android.preference.PreferenceActivity; import com.android.dialer.inject.HasRootComponent; -import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; +import com.android.incallui.speakeasy.Annotations.SpeakEasyIconResourceId; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject; import com.android.incallui.speakeasy.Annotations.SpeakEasyTextResourceId; -import com.google.common.base.Optional; import dagger.Subcomponent; +import java.util.Optional; /** Dagger component to get SpeakEasyCallManager. */ @Subcomponent public abstract class SpeakEasyComponent { public static SpeakEasyComponent get(Context context) { - return ((SpeakEasyComponent.HasComponent) - ((HasRootComponent) context.getApplicationContext()).component()) + return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) .speakEasyComponent(); } @@ -43,7 +42,7 @@ public abstract class SpeakEasyComponent { public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject(); - public abstract @SpeakEasyChipResourceId Optional<Integer> speakEasyChip(); + public abstract @SpeakEasyIconResourceId Optional<Integer> speakEasyIconResource(); public abstract @SpeakEasyTextResourceId Optional<Integer> speakEasyTextResource(); diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java index 5441075ef..781eee030 100644 --- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java +++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java @@ -19,14 +19,14 @@ package com.android.incallui.speakeasy; import android.preference.PreferenceActivity; import com.android.dialer.inject.DialerVariant; import com.android.dialer.inject.InstallIn; -import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; +import com.android.incallui.speakeasy.Annotations.SpeakEasyIconResourceId; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity; import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject; import com.android.incallui.speakeasy.Annotations.SpeakEasyTextResourceId; -import com.google.common.base.Optional; import dagger.Binds; import dagger.Module; import dagger.Provides; +import java.util.Optional; /** Module which binds {@link SpeakEasyCallManagerStub}. */ @InstallIn(variants = {DialerVariant.DIALER_TEST}) @@ -39,21 +39,21 @@ public abstract class StubSpeakEasyModule { @Provides static @SpeakEasySettingsActivity Optional<PreferenceActivity> provideSpeakEasySettingsActivity() { - return Optional.absent(); + return Optional.empty(); } @Provides static @SpeakEasySettingsObject Optional<Object> provideSpeakEasySettingsObject() { - return Optional.absent(); + return Optional.empty(); } @Provides - static @SpeakEasyChipResourceId Optional<Integer> provideSpeakEasyChip() { - return Optional.absent(); + static @SpeakEasyIconResourceId Optional<Integer> provideSpeakEasyIconResource() { + return Optional.empty(); } @Provides static @SpeakEasyTextResourceId Optional<Integer> provideSpeakEasyTextResource() { - return Optional.absent(); + return Optional.empty(); } } |