diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-07-10 20:56:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-07-10 20:56:34 +0000 |
| commit | e0dbd9f9074559d73e93aeacc3ba27f65e820670 (patch) | |
| tree | 7d98ebc6935ef764aa392f340a2dab4b69132d79 /java/com/android/incallui/speakeasy/SpeakEasyComponent.java | |
| parent | 127998d2dde1014930e10d6dbd8841ab2c8228e4 (diff) | |
| parent | 57ac221e28cd86ecd2b114ab1a0a9465d1c757de (diff) | |
Merge changes from topic "ui-update"
* changes:
Revert "Ignore display cutout for in call UI."
Revert "UI refresh for ringing screen."
Revert "Internal change"
Revert "UI refresh for voice call screen."
Revert "Fix color for disabled button in voice call."
Revert "Update style for important call badge."
Revert "Change reply with sms to chip."
Revert "Update emergency call map and device number UI."
Revert "UI refresh for search bar."
Revert "UI refersh for status bar."
Revert "UI refresh for search fragment."
Revert "UI refresh for FAB."
Revert "UI refresh for bottom nav bar."
Revert "UI refresh for reply with sms bottom sheet."
Revert "UI refresh for call log items."
Revert "UI Refresh for contacts."
Diffstat (limited to 'java/com/android/incallui/speakeasy/SpeakEasyComponent.java')
| -rw-r--r-- | java/com/android/incallui/speakeasy/SpeakEasyComponent.java | 9 |
1 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 84a21f3d1..422ebd6da 100644 --- a/java/com/android/incallui/speakeasy/SpeakEasyComponent.java +++ b/java/com/android/incallui/speakeasy/SpeakEasyComponent.java @@ -19,19 +19,20 @@ package com.android.incallui.speakeasy; import android.content.Context; import android.preference.PreferenceActivity; import com.android.dialer.inject.HasRootComponent; -import com.android.incallui.speakeasy.Annotations.SpeakEasyIconResourceId; +import com.android.incallui.speakeasy.Annotations.SpeakEasyChipResourceId; 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; import dagger.Subcomponent; -import java.util.Optional; /** Dagger component to get SpeakEasyCallManager. */ @Subcomponent public abstract class SpeakEasyComponent { public static SpeakEasyComponent get(Context context) { - return ((HasComponent) ((HasRootComponent) context.getApplicationContext()).component()) + return ((SpeakEasyComponent.HasComponent) + ((HasRootComponent) context.getApplicationContext()).component()) .speakEasyComponent(); } @@ -42,7 +43,7 @@ public abstract class SpeakEasyComponent { public abstract @SpeakEasySettingsObject Optional<Object> speakEasySettingsObject(); - public abstract @SpeakEasyIconResourceId Optional<Integer> speakEasyIconResource(); + public abstract @SpeakEasyChipResourceId Optional<Integer> speakEasyChip(); public abstract @SpeakEasyTextResourceId Optional<Integer> speakEasyTextResource(); |