summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authoruabdullah <uabdullah@google.com>2018-06-20 10:55:24 -0700
committerCopybara-Service <copybara-piper@google.com>2018-06-20 12:25:18 -0700
commit0509a47f6ae36fcf40c04bc5b5927cade4c8709b (patch)
treee5bdbe4da07845f4fde2ba1ed858c4cfaf9fa75c /java
parent175b1a7a5e66076e0d7a2a2938b64468bdae149c (diff)
Update settings
Bug: 109890761,73736474,73737524,73773935,79701706 Test: Unit Test PiperOrigin-RevId: 201379249 Change-Id: I0a18adc4c8df33c65e81281928508897679b5994
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/speakeasy/SpeakEasyComponent.java4
-rw-r--r--java/com/android/incallui/speakeasy/StubSpeakEasyModule.java5
2 files changed, 5 insertions, 4 deletions
diff --git a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
index 5d536321d..422ebd6da 100644
--- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
+++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java
@@ -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();
diff --git a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
index bab52ffcb..5441075ef 100644
--- a/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
+++ b/java/com/android/incallui/speakeasy/StubSpeakEasyModule.java
@@ -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();
}