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

Commit 6125ea19 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update settings"

parents 87f4ca06 0509a47f

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

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



import android.content.Context;

import android.support.v7.app.AppCompatActivity;

import android.preference.PreferenceActivity;

import com.android.dialer.inject.HasRootComponent;

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

import com.android.incallui.speakeasy.Annotations.SpeakEasySettingsActivity;
@@ -38,7 +38,7 @@ public abstract class SpeakEasyComponent { 


  public abstract SpeakEasyCallManager speakEasyCallManager();



  public abstract @SpeakEasySettingsActivity Optional<AppCompatActivity>

  public abstract @SpeakEasySettingsActivity Optional<PreferenceActivity>

      speakEasySettingsActivity();



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

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

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.incallui.speakeasy;



import android.support.v7.app.AppCompatActivity;

import android.preference.PreferenceActivity;

import com.android.dialer.inject.DialerVariant;

import com.android.dialer.inject.InstallIn;

import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId;
@@ -37,7 +37,8 @@ public abstract class StubSpeakEasyModule { 
  abstract SpeakEasyCallManager bindsSpeakEasy(SpeakEasyCallManagerStub stub);



  @Provides

  static @SpeakEasySettingsActivity Optional<AppCompatActivity> provideSpeakEasySettingsActivity() {

  static @SpeakEasySettingsActivity Optional<PreferenceActivity>

      provideSpeakEasySettingsActivity() {

    return Optional.absent();

  }