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

Commit 190343ac authored by zachh's avatar zachh Committed by Copybara-Service
Browse files

Inlined ConfigProviderBindings.get() and removed ConfigProviderBindings. 

It no longer provides any value, so just use dagger directly.

Bug: 80441695
Test: tap
PiperOrigin-RevId: 198806461
Change-Id: Id607abb65b77633bce511ad0c943ac19453a85d5
parent b7321a9f

java/com/android/dialer/app/DialtactsActivity.java

+6 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ import com.android.dialer.common.LogUtil; 
import com.android.dialer.common.UiUtil;

import com.android.dialer.common.concurrent.DialerExecutorComponent;

import com.android.dialer.common.concurrent.ThreadUtil;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.constants.ActivityRequestCodes;

import com.android.dialer.contactsfragment.ContactsFragment;

import com.android.dialer.contactsfragment.ContactsFragment.OnContactSelectedListener;
@@ -367,7 +367,8 @@ public class DialtactsActivity extends TransactionSafeActivity 
    super.onCreate(savedInstanceState);



    firstLaunch = true;

    isLastTabEnabled = ConfigProviderBindings.get(this).getBoolean("last_tab_enabled", false);

    isLastTabEnabled =

        ConfigProviderComponent.get(this).getConfigProvider().getBoolean("last_tab_enabled", false);



    final Resources resources = getResources();

    actionBarHeight = resources.getDimensionPixelSize(R.dimen.action_bar_height_large);
@@ -1622,6 +1623,8 @@ public class DialtactsActivity extends TransactionSafeActivity 
  }



  private boolean newFavoritesIsEnabled() {

    return ConfigProviderBindings.get(this).getBoolean("enable_new_favorites_tab", false);

    return ConfigProviderComponent.get(this)

        .getConfigProvider()

        .getBoolean("enable_new_favorites_tab", false);

  }

}

java/com/android/dialer/app/calllog/CallLogAdapter.java

+8 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import com.android.dialer.common.LogUtil; 
import com.android.dialer.common.concurrent.AsyncTaskExecutor;

import com.android.dialer.common.concurrent.AsyncTaskExecutors;

import com.android.dialer.compat.android.provider.VoicemailCompat;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.duo.Duo;

import com.android.dialer.duo.DuoComponent;

import com.android.dialer.duo.DuoListener;
@@ -287,7 +287,8 @@ public class CallLogAdapter extends GroupingListAdapter 
      new View.OnLongClickListener() {

        @Override

        public boolean onLongClick(View v) {

          if (ConfigProviderBindings.get(v.getContext())

          if (ConfigProviderComponent.get(v.getContext())

                  .getConfigProvider()

                  .getBoolean(ENABLE_CALL_LOG_MULTI_SELECT, ENABLE_CALL_LOG_MULTI_SELECT_FLAG)

              && voicemailPlaybackPresenter != null) {

            if (v.getId() == R.id.primary_action_view || v.getId() == R.id.quick_contact_photo) {
@@ -852,7 +853,9 @@ public class CallLogAdapter extends GroupingListAdapter 
  }



  private boolean isHideableEmergencyNumberRow(@Nullable String number) {

    if (!ConfigProviderBindings.get(activity).getBoolean(FILTER_EMERGENCY_CALLS_FLAG, false)) {

    if (!ConfigProviderComponent.get(activity)

        .getConfigProvider()

        .getBoolean(FILTER_EMERGENCY_CALLS_FLAG, false)) {

      return false;

    }

    return number != null && PhoneNumberUtils.isEmergencyNumber(number);
@@ -1058,7 +1061,8 @@ public class CallLogAdapter extends GroupingListAdapter 
              details.countryIso,

              details.cachedContactInfo,

              position

                  < ConfigProviderBindings.get(activity)

                  < ConfigProviderComponent.get(activity)

                      .getConfigProvider()

                      .getLong("number_of_call_to_do_remote_lookup", 5L));

      logCp2Metrics(details, info);

    }

java/com/android/dialer/app/calllog/CallLogFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import com.android.dialer.blocking.FilteredNumberAsyncQueryHandler; 
import com.android.dialer.common.Assert;

import com.android.dialer.common.FragmentUtils;

import com.android.dialer.common.LogUtil;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.database.CallLogQueryHandler;

import com.android.dialer.database.CallLogQueryHandler.Listener;

import com.android.dialer.location.GeoUtil;
@@ -297,7 +297,9 @@ public class CallLogFragment extends Fragment 


  protected void setupView(View view) {

    recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);

    if (ConfigProviderBindings.get(getContext()).getBoolean("is_call_log_item_anim_null", false)) {

    if (ConfigProviderComponent.get(getContext())

        .getConfigProvider()

        .getBoolean("is_call_log_item_anim_null", false)) {

      recyclerView.setItemAnimator(null);

    }

    recyclerView.setHasFixedSize(true);

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+9 −5
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ import com.android.dialer.clipboard.ClipboardUtils; 
import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import com.android.dialer.common.concurrent.AsyncTaskExecutors;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.constants.ActivityRequestCodes;

import com.android.dialer.contactphoto.ContactPhotoManager;

import com.android.dialer.dialercontact.DialerContact;
@@ -309,7 +309,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
    primaryActionButtonView.setOnClickListener(this);

    primaryActionView.setOnClickListener(this.expandCollapseListener);

    if (this.voicemailPlaybackPresenter != null

        && ConfigProviderBindings.get(this.context)

        && ConfigProviderComponent.get(this.context)

            .getConfigProvider()

            .getBoolean(

                CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT,

                CallLogAdapter.ENABLE_CALL_LOG_MULTI_SELECT_FLAG)) {
@@ -710,7 +711,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
          videoCallButtonView.setVisibility(View.VISIBLE);

          CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();

        } else if (duo.isActivated(context) && !identifiedSpamCall) {

          if (ConfigProviderBindings.get(context)

          if (ConfigProviderComponent.get(context)

              .getConfigProvider()

              .getBoolean("enable_call_log_duo_invite_button", false)) {

            inviteVideoButtonView.setTag(IntentProvider.getDuoInviteIntentProvider(number));

            inviteVideoButtonView.setVisibility(View.VISIBLE);
@@ -719,7 +721,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
          }

        } else if (duo.isEnabled(context) && !identifiedSpamCall) {

          if (!duo.isInstalled(context)) {

            if (ConfigProviderBindings.get(context)

            if (ConfigProviderComponent.get(context)

                .getConfigProvider()

                .getBoolean("enable_call_log_install_duo_button", false)) {

              setUpVideoButtonView.setTag(IntentProvider.getInstallDuoIntentProvider());

              setUpVideoButtonView.setVisibility(View.VISIBLE);
@@ -728,7 +731,8 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder 
              CallIntentBuilder.increaseLightbringerCallButtonAppearInExpandedCallLogItemCount();

            }

          } else {

            if (ConfigProviderBindings.get(context)

            if (ConfigProviderComponent.get(context)

                .getConfigProvider()

                .getBoolean("enable_call_log_activate_duo_button", false)) {

              setUpVideoButtonView.setTag(IntentProvider.getSetUpDuoIntentProvider());

              setUpVideoButtonView.setVisibility(View.VISIBLE);

java/com/android/dialer/app/calllog/CallLogNotificationsQueryHelper.java

+3 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import com.android.dialer.calllogutils.PhoneNumberDisplayUtil; 
import com.android.dialer.common.LogUtil;

import com.android.dialer.common.database.Selection;

import com.android.dialer.compat.android.provider.VoicemailCompat;

import com.android.dialer.configprovider.ConfigProviderBindings;

import com.android.dialer.configprovider.ConfigProviderComponent;

import com.android.dialer.location.GeoUtil;

import com.android.dialer.phonenumbercache.ContactInfo;

import com.android.dialer.phonenumbercache.ContactInfoHelper;
@@ -167,7 +167,8 @@ public class CallLogNotificationsQueryHelper { 
    return newCallsQuery.query(

        Calls.VOICEMAIL_TYPE,

        System.currentTimeMillis()

            - ConfigProviderBindings.get(context)

            - ConfigProviderComponent.get(context)

                .getConfigProvider()

                .getLong(

                    CONFIG_NEW_VOICEMAIL_NOTIFICATION_THRESHOLD_OFFSET, TimeUnit.DAYS.toMillis(7)));

  }