commit 9337f657f6c2890fd3d043b943da3234a7fa2d1f
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 05 04:13:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 05 04:13:03 2018 +0000
tree 6271b6dc6f6a6dfe4c75e93d109da16aecc6e47e
parent 561ad94872d90b7a487d6fd966f93c0e8601492a
parent 16191f1a3049d9ff81454b63ebb986b2568924ba

Merge "Update dagger types."

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

diff --git a/java/com/android/incallui/speakeasy/Annotations.java b/java/com/android/incallui/speakeasy/Annotations.java
index f369ce4..5d513fc 100644
--- a/java/com/android/incallui/speakeasy/Annotations.java
+++ b/java/com/android/incallui/speakeasy/Annotations.java
@@ -32,4 +32,8 @@
   /** A Speakeasy settings fragment */
   @Qualifier
   public @interface SpeakEasySettingsFragment {}
+
+  /** A Speakeasy settings object */
+  @Qualifier
+  public @interface SpeakEasySettingsObject {}
 }

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

diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
index 6257cc0..ab64380 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
@@ -17,10 +17,11 @@
 package com.android.incallui.speakeasy;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
+import android.preference.PreferenceFragment;
 import com.android.dialer.inject.HasRootComponent;
 import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;
 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;
@@ -31,7 +32,10 @@
 
   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();
 

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

diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
index 9f23ddd..e844ad3 100644
--- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
+++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
@@ -16,11 +16,12 @@
 
 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.InstallIn;
 import com.android.incallui.speakeasy.Annotations.SpeakEasyIcon;
 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;
@@ -36,7 +37,13 @@
   abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);
 
   @Provides
-  static @SpeakEasySettingsFragment Optional<Fragment> provideSpeakEasySettingsFragment() {
+  static @SpeakEasySettingsFragment Optional<PreferenceFragment>
+      provideSpeakEasySettingsFragment() {
+    return Optional.absent();
+  }
+
+  @Provides
+  static @SpeakEasySettingsObject Optional<Object> provideSpeakEasySettingsObject() {
     return Optional.absent();
   }