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

Commit 9af2e291 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use an activity instead of a fragment for SpeakEasySettings"

parents 19b19168 a5b8041a

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public final class Annotations { 


  /** A Speakeasy settings fragment */

  @Qualifier

  public @interface SpeakEasySettingsFragment {}

  public @interface SpeakEasySettingsActivity {}



  /** A Speakeasy settings object */

  @Qualifier

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

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



import android.content.Context;

import android.preference.PreferenceFragment;

import android.support.v7.app.AppCompatActivity;

import com.android.dialer.inject.HasRootComponent;

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

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

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;
@@ -30,10 +30,16 @@ import dagger.Subcomponent; 
@Subcomponent

public abstract class SpeakEasyComponent {



  public static SpeakEasyComponent get(Context context) {

    return ((SpeakEasyComponent.HasComponent)

            ((HasRootComponent) context.getApplicationContext()).component())

        .speakEasyComponent();

  }



  public abstract SpeakEasyCallManager speakEasyCallManager();



  public abstract @SpeakEasySettingsFragment Optional<PreferenceFragment>

      speakEasySettingsFragment();

  public abstract @SpeakEasySettingsActivity Optional<AppCompatActivity>

      speakEasySettingsActivity();



  public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject();
@@ -41,12 +47,6 @@ public abstract class SpeakEasyComponent { 


  public abstract @SpeakEasyTextResourceId Optional<Integer> speakEasyTextResource();



  public static SpeakEasyComponent get(Context context) {

    return ((SpeakEasyComponent.HasComponent)

            ((HasRootComponent) context.getApplicationContext()).component())

        .speakEasyComponent();

  }



  /** Used to refer to the root application component. */

  public interface HasComponent {

    SpeakEasyComponent speakEasyComponent();

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

+3 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 


package com.android.incallui.speakeasy;



import android.preference.PreferenceFragment;

import android.support.v7.app.AppCompatActivity;

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.SpeakEasySettingsFragment;

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;
@@ -37,8 +37,7 @@ public abstract class StubSpeakEasyModule { 
  abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);



  @Provides

  static @SpeakEasySettingsFragment Optional<PreferenceFragment>

      provideSpeakEasySettingsFragment() {

  static @SpeakEasySettingsActivity Optional<AppCompatActivity> provideSpeakEasySettingsActivity() {

    return Optional.absent();

  }