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

Commit 9ed3262d authored by wangqi's avatar wangqi Committed by android-build-merger
Browse files

Merge changes Ie424d231,Ied6072ca,I1902e527,Ie649a9fb,I11fc1a02, ...

am: 14ceb5d6

Change-Id: I3902a91e7aa2206840a4d7941da35b4e2ad2e5f8
parents 9466c243 14ceb5d6
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -22,11 +22,14 @@ import com.android.dialer.calllog.datasources.DataSources;
import com.android.dialer.calllog.datasources.phonelookup.PhoneLookupDataSource;
import com.android.dialer.calllog.datasources.systemcalllog.SystemCallLogDataSource;
import com.android.dialer.calllog.datasources.voicemail.VoicemailDataSource;
import com.android.dialer.inject.DialerVariant;
import com.android.dialer.inject.InstallIn;
import com.google.common.collect.ImmutableList;
import dagger.Module;
import dagger.Provides;

/** Dagger module which satisfies call log dependencies. */
@InstallIn(variants = {DialerVariant.DIALER_TEST})
@Module(includes = CallLogDatabaseModule.class)
public abstract class CallLogModule {

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.dialer.common.Assert;
import com.android.dialer.duo.Duo;
import com.android.dialer.duo.DuoComponent;
import com.android.dialer.logging.Logger;
import com.android.dialer.promotion.RttPromotion;
import com.android.dialer.storage.StorageComponent;
import com.android.dialer.time.Clock;
import java.lang.annotation.Retention;
@@ -173,6 +174,9 @@ final class NewCallLogAdapter extends RecyclerView.Adapter<ViewHolder> {
  }

  private boolean shouldShowDuoDisclosureCard() {
    if (new RttPromotion(activity).shouldShow()) {
      return false;
    }
    // Don't show the Duo disclosure card if
    // (1) Duo integration is not enabled on the device, or
    // (2) Duo is not activated.
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@
          android:layout_gravity="end"
          android:paddingLeft="14dp"
          android:paddingRight="14dp"
          android:text="@string/new_call_log_duo_disclosure_card_ok"
          android:text="@string/ok_got_it"
          android:textSize="14sp"/>
    </LinearLayout>
  </LinearLayout>
+0 −3
Original line number Diff line number Diff line
@@ -36,7 +36,4 @@
    Google Duo video calling lets you chat with friends and family face-to-face. Data charges may apply. <xliff:g example="Learn More">%1$s</xliff:g>
  </string>

  <!-- Text on the button on the Duo disclosure card. [CHAR_LIMIT=30] -->
  <string name="new_call_log_duo_disclosure_card_ok">OK, got it</string>

</resources>
+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.dialer.commandline;
import android.content.Context;
import com.android.dialer.function.Supplier;
import com.android.dialer.inject.HasRootComponent;
import com.android.dialer.inject.IncludeInDialerRoot;
import com.google.common.collect.ImmutableMap;
import dagger.Subcomponent;

@@ -34,6 +35,7 @@ public abstract class CommandLineComponent {
  }

  /** Used to refer to the root application component. */
  @IncludeInDialerRoot
  public interface HasComponent {
    CommandLineComponent commandLineComponent();
  }
Loading