diff options
author | Eric Erfanian <erfanian@google.com> | 2018-07-10 14:23:00 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-10 14:23:00 -0700 |
commit | 51733a7747f1b15817f83ed12c37e54ffbc0b081 (patch) | |
tree | ce72b720421049c0b4094ab8c9843bc6b7ac80bc /java/com/android/incallui/speakeasy/StubSpeakEasyModule.java | |
parent | 56162775ef882d22b0308dcc32b2ed1dcd9d8d9f (diff) | |
parent | 9ef4e5430114fa5996d0ceaeb4dad3fb2d4ee811 (diff) |
Merge changes from topic "ui-update" am: e0dbd9f907 am: 247a5d039a
am: 9ef4e54301
Change-Id: I4513871ae9e89c314bc5f275ff0f6af3c597987b
Diffstat (limited to 'java/com/android/incallui/speakeasy/StubSpeakEasyModule.java')
-rw-r--r-- | java/com/android/incallui/speakeasy/StubSpeakEasyModule.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java index 781eee030..5441075ef 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.SpeakEasyIconResourceId; +import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; 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.empty(); + return Optional.absent(); } @Provides static @SpeakEasySettingsObject Optional<Object> provideSpeakEasySettingsObject() { - return Optional.empty(); + return Optional.absent(); } @Provides - static @SpeakEasyIconResourceId Optional<Integer> provideSpeakEasyIconResource() { - return Optional.empty(); + static @SpeakEasyChipResourceId Optional<Integer> provideSpeakEasyChip() { + return Optional.absent(); } @Provides static @SpeakEasyTextResourceId Optional<Integer> provideSpeakEasyTextResource() { - return Optional.empty(); + return Optional.absent(); } } |