Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a044467c authored by erfanian's avatar erfanian Committed by android-build-merger
Browse files

Merge "Update dagger types." 

am: 9337f657

Change-Id: I18b77316be05fdba5285cd24ff74ffd0d795b89c
parents 87e15015 9337f657

java/com/android/incallui/speakeasy/Annotations.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -32,4 +32,8 @@ public final class Annotations { 
  /** A Speakeasy settings fragment */

  /** A Speakeasy settings fragment */

  @Qualifier

  @Qualifier

  public @interface SpeakEasySettingsFragment {}

  public @interface SpeakEasySettingsFragment {}



  /** A Speakeasy settings object */

  @Qualifier

  public @interface SpeakEasySettingsObject {}

}
 
}

java/com/android/incallui/speakeasy/SpeakEasyComponent.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -17,10 +17,11 @@ 
package com.android.incallui.speakeasy;

package com.android.incallui.speakeasy;





import android.content.Context;

import android.content.Context;

import android.support.v4.app.Fragment;

import android.preference.PreferenceFragment;

import com.android.dialer.inject.HasRootComponent;

import com.android.dialer.inject.HasRootComponent;

import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;

import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject;

import com.android.incallui.speakeasy.Annotations.SpeakEasyText;

import com.android.incallui.speakeasy.Annotations.SpeakEasyText;

import com.google.common.base.Optional;

import com.google.common.base.Optional;

import dagger.Subcomponent;

import dagger.Subcomponent;
@@ -31,7 +32,10 @@ public abstract class SpeakEasyComponent { 




  public abstract SpeakEasyCallManager speakEasyCallManager();

  public abstract SpeakEasyCallManager speakEasyCallManager();





  public abstract @SpeakEasySettingsFragment Optional<Fragment> speakEasySettingsFragment();

  public abstract @SpeakEasySettingsFragment Optional<PreferenceFragment>

      speakEasySettingsFragment();



  public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject();





  public abstract @SpeakEasyIcon Optional<Integer> speakEasyIcon();

  public abstract @SpeakEasyIcon Optional<Integer> speakEasyIcon();

java/com/android/incallui/speakeasy/StubSpeakEasyModule.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -16,11 +16,12 @@ 




package com.android.incallui.speakeasy;

package com.android.incallui.speakeasy;





import android.support.v4.app.Fragment;

import android.preference.PreferenceFragment;

import com.android.dialer.inject.DialerVariant;

import com.android.dialer.inject.DialerVariant;

import com.android.dialer.inject.InstallIn;

import com.android.dialer.inject.InstallIn;

import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;

import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsFragment;

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsObject;

import com.android.incallui.speakeasy.Annotations.SpeakEasyText;

import com.android.incallui.speakeasy.Annotations.SpeakEasyText;

import com.google.common.base.Optional;

import com.google.common.base.Optional;

import dagger.Binds;

import dagger.Binds;
@@ -36,7 +37,13 @@ public abstract class StubSpeakEasyModule { 
  abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);

  abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);





  @Provides

  @Provides

  static @SpeakEasySettingsFragment Optional<Fragment> provideSpeakEasySettingsFragment() {

  static @SpeakEasySettingsFragment Optional<PreferenceFragment>

      provideSpeakEasySettingsFragment() {

    return Optional.absent();

  }



  @Provides

  static @SpeakEasySettingsObject Optional<Object> provideSpeakEasySettingsObject() {

    return Optional.absent();

    return Optional.absent();

  }

  }