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

Commit 45b779f1 authored by maxwelb's avatar maxwelb Committed by android-build-merger
Browse files

Merge changes I1c2c08cc,I76a0b43d,Ifa718fb0 

am: b19a3aaa

Change-Id: I6b78f7abfef4f8ad4e960d1b711fbac5596e3627
parents 1a9d70ab b19a3aaa

java/com/android/dialer/app/res/layout/call_log_list_item.xml

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ 
                  android:id="@+id/voicemail_transcription_rating_good"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:contentDescription="@string/description_rating_good"

                  android:gravity="end|center_vertical"

                  android:focusable="true"

                  android:src="@drawable/quantum_ic_thumb_up_grey600_24"/>
@@ -211,6 +212,7 @@ 
                  android:id="@+id/voicemail_transcription_rating_bad"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:contentDescription="@string/description_rating_bad"

                  android:gravity="end|center_vertical"

                  android:focusable="true"

                  android:src="@drawable/quantum_ic_thumb_down_grey600_24"/>

java/com/android/dialer/app/res/values/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -706,6 +706,14 @@ 
  <!-- Message displayed after user has rated a voicemail transcription [CHAR LIMIT=30] -->

  <string name="voicemail_transcription_rating_thanks">Thanks for your feedback</string>



  <!-- Describes the thumbs up, 'good' transcription button. Read by TalkBack.

      [CHAR LIMIT=NONE] -->

  <string name="description_rating_good">Like</string>



  <!-- Describes the thumbs down, 'bad' transcription button. Read by TalkBack.

      [CHAR LIMIT=NONE] -->

  <string name="description_rating_bad">Dislike</string>



  <!-- Button text to prompt a user to open an sms conversation [CHAR LIMIT=NONE] -->

  <string name="view_conversation">View</string>

java/com/android/dialer/main/impl/OldMainActivityPeer.java

+72 −3
Original line number Diff line number Diff line
@@ -23,11 +23,14 @@ import android.app.KeyguardManager; 
import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.database.ContentObserver;

import android.database.Cursor;

import android.net.Uri;

import android.os.Bundle;

import android.os.Handler;

import android.provider.CallLog.Calls;

import android.provider.ContactsContract.QuickContact;

import android.provider.VoicemailContract;

import android.support.annotation.Nullable;

import android.support.design.widget.FloatingActionButton;

import android.support.design.widget.Snackbar;
@@ -91,9 +94,15 @@ import com.android.dialer.smartdial.util.SmartDialPrefix; 
import com.android.dialer.storage.StorageComponent;

import com.android.dialer.telecom.TelecomUtil;

import com.android.dialer.util.DialerUtils;

import com.android.dialer.util.PermissionsUtil;

import com.android.dialer.util.TransactionSafeActivity;

import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;

import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;

import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;

import com.android.dialer.voicemailstatus.VoicemailStatusHelper;

import com.android.voicemail.VoicemailComponent;

import com.google.common.util.concurrent.ListenableFuture;

import java.util.Locale;

import java.util.concurrent.TimeUnit;



/**
@@ -273,7 +282,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    if (VoicemailComponent.get(context)

        .getVoicemailClient()

        .isVoicemailEnabled(context, defaultUserSelectedAccount)) {

      LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "Voicemail is not enabled");

      LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "Voicemail is enabled");

      return true;

    }

    LogUtil.i("OldMainActivityPeer.canVoicemailTabBeShown", "returning false");
@@ -706,7 +715,6 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
   *   <li>Marking missed calls as read when appropriate. See {@link

   *       #markMissedCallsAsReadAndRemoveNotification()}

   *   <li>TODO(calderwoodra): multiselect

   *   <li>TODO(calderwoodra): voicemail status

   * </ul>

   *

   * @see CallLogFragmentListener
@@ -727,6 +735,15 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    private long timeSelected = -1;

    private boolean activityIsAlive;



    private final ContentObserver voicemailStatusObserver =

        new ContentObserver(new Handler()) {

          @Override

          public void onChange(boolean selfChange) {

            super.onChange(selfChange);

            callLogQueryHandler.fetchVoicemailStatus();

          }

        };



    MainCallLogFragmentListener(

        Context context,

        ContentResolver contentResolver,
@@ -738,6 +755,21 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
      this.toolbar = toolbar;

    }



    private void registerVoicemailStatusContentObserver(Context context) {



      if (PermissionsUtil.hasReadVoicemailPermissions(context)

          && PermissionsUtil.hasAddVoicemailPermissions(context)) {

        context

            .getContentResolver()

            .registerContentObserver(

                VoicemailContract.Status.CONTENT_URI, true, voicemailStatusObserver);

      } else {

        LogUtil.w(

            "MainCallLogFragmentListener.registerVoicemailStatusContentObserver",

            "no voicemail read/add permissions");

      }

    }



    @Override

    public void updateTabUnreadCounts() {

      callLogQueryHandler.fetchMissedCallsUnreadCount();
@@ -752,7 +784,42 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 


    @Override

    public void onVoicemailStatusFetched(Cursor statusCursor) {

      // TODO(calderwoodra): handle this when voicemail is implemented

      LogUtil.i("OldMainActivityPeer.MainCallLogFragmentListener", "onVoicemailStatusFetched");

      VoicemailStatusCorruptionHandler.maybeFixVoicemailStatus(

          context, statusCursor, Source.Activity);



      // Update hasActiveVoicemailProvider, which controls the number of tabs displayed.

      int numberOfActiveVoicemailSources =

          VoicemailStatusHelper.getNumberActivityVoicemailSources(statusCursor);



      boolean hasActiveVoicemailProvider = numberOfActiveVoicemailSources > 0;

      LogUtil.i(

          "OldMainActivityPeer.onVoicemailStatusFetched",

          String.format(

              Locale.US,

              "hasActiveVoicemailProvider:%b, number of active voicemail sources:%d",

              hasActiveVoicemailProvider,

              numberOfActiveVoicemailSources));



      if (hasActiveVoicemailProvider) {

        // TODO(yueg): Use new logging for VVM_TAB_VISIBLE

        // Logger.get(context).logImpression(DialerImpression.Type.VVM_TAB_VISIBLE);

        bottomNavBar.showVoicemail(true);

        callLogQueryHandler.fetchVoicemailUnreadCount();

      } else {

        bottomNavBar.showVoicemail(false);

      }



      StorageComponent.get(context)

          .unencryptedSharedPrefs()

          .edit()

          .putBoolean(

              VisualVoicemailEnabledChecker.PREF_KEY_HAS_ACTIVE_VOICEMAIL_PROVIDER,

              hasActiveVoicemailProvider)

          .apply();



      // TODO(uabdullah): Check if we need to force move to the VM tab (e.g in the event of

      // clicking a vm notification and a status wasn't yet fetched).

    }



    @Override
@@ -812,6 +879,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 


    public void onActivityResume() {

      activityIsAlive = true;

      registerVoicemailStatusContentObserver(context);

      callLogQueryHandler.fetchVoicemailStatus();

      callLogQueryHandler.fetchMissedCallsUnreadCount();

      // Reset the tab on resume to restart the timer
@@ -820,6 +888,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 


    /** Should be called when {@link Activity#onStop()} is called. */

    public void onActivityStop(boolean changingConfigurations, boolean keyguardLocked) {

      context.getContentResolver().unregisterContentObserver(voicemailStatusObserver);

      activityIsAlive = false;

      if (viewedCallLogTabPastTimeThreshold() && !changingConfigurations && !keyguardLocked) {

        markMissedCallsAsReadAndRemoveNotification();

java/com/android/dialer/main/impl/bottomnav/BottomNavBar.java

+18 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.util.AttributeSet; 
import android.view.View;

import android.widget.LinearLayout;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;

import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;
@@ -123,8 +124,25 @@ public final class BottomNavBar extends LinearLayout { 
    }

  }



  /**

   * Displays or hides the voicemail tab.

   *

   * <p>In the event that the voicemail tab was earlier visible but is now no longer visible, we

   * move to the speed dial tab.

   *

   * @param showTab whether to hide or show the voicemail

   */

  public void showVoicemail(boolean showTab) {

    LogUtil.i("OldMainActivityPeer.showVoicemail", "showing Tab:%b", showTab);

    int voicemailpreviousVisibility = voicemail.getVisibility();

    voicemail.setVisibility(showTab ? View.VISIBLE : View.GONE);

    int voicemailcurrentVisibility = voicemail.getVisibility();



    if (voicemailpreviousVisibility != voicemailcurrentVisibility

        && voicemailpreviousVisibility == View.VISIBLE) {

      LogUtil.i("OldMainActivityPeer.showVoicemail", "hid VM tab and moved to speed dial tab");

      selectTab(TabIndex.SPEED_DIAL);

    }

  }



  public void setNotificationCount(@TabIndex int tab, int count) {

java/com/android/dialer/voicemail/listui/NewVoicemailFragment.java

+36 −4
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.support.v7.widget.RecyclerView; 
import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.FrameLayout;

import com.android.dialer.calllog.CallLogComponent;

import com.android.dialer.calllog.RefreshAnnotatedCallLogReceiver;

import com.android.dialer.common.LogUtil;
@@ -38,6 +39,7 @@ import com.android.dialer.common.concurrent.UiListener; 
import com.android.dialer.glidephotomanager.GlidePhotoManagerComponent;

import com.android.dialer.voicemail.listui.error.VoicemailStatus;

import com.android.dialer.voicemailstatus.VoicemailStatusQuery;

import com.android.dialer.widget.EmptyContentView;

import com.android.voicemail.VoicemailComponent;

import com.google.common.collect.ImmutableList;

import com.google.common.util.concurrent.ListenableFuture;
@@ -52,6 +54,11 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba 
  private RefreshAnnotatedCallLogReceiver refreshAnnotatedCallLogReceiver;

  private UiListener<ImmutableList<VoicemailStatus>> queryVoicemailStatusTableListener;



  // View required to show/hide recycler and empty views

  FrameLayout fragmentRootFrameLayout;



  private EmptyContentView emptyContentView;



  public NewVoicemailFragment() {

    LogUtil.enterBlock("NewVoicemailFragment.NewVoicemailFragment");

  }
@@ -147,10 +154,14 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba 
  public View onCreateView(

      LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

    LogUtil.enterBlock("NewVoicemailFragment.onCreateView");

    View view = inflater.inflate(R.layout.new_voicemail_call_log_fragment, container, false);

    recyclerView = view.findViewById(R.id.new_voicemail_call_log_recycler_view);



    fragmentRootFrameLayout =

        (FrameLayout) inflater.inflate(R.layout.new_voicemail_call_log_fragment, container, false);

    recyclerView = fragmentRootFrameLayout.findViewById(R.id.new_voicemail_call_log_recycler_view);



    emptyContentView = fragmentRootFrameLayout.findViewById(R.id.empty_content_view);

    getLoaderManager().restartLoader(0, null, this);

    return view;

    return fragmentRootFrameLayout;

  }



  @Override
@@ -162,6 +173,12 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba 
  @Override

  public void onLoadFinished(Loader<Cursor> loader, Cursor data) {

    LogUtil.i("NewVoicemailFragment.onLoadFinished", "cursor size is %d", data.getCount());

    if (data.getCount() == 0) {

      showEmptyVoicemailFragmentView();

      return;

    }

    showView(recyclerView);



    if (recyclerView.getAdapter() == null) {

      recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));

      // TODO(uabdullah): Replace getActivity().getFragmentManager() with getChildFragment()
@@ -182,9 +199,24 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba 
          recyclerView.getAdapter());

      ((NewVoicemailAdapter) recyclerView.getAdapter()).updateCursor(data);

      ((NewVoicemailAdapter) recyclerView.getAdapter()).checkAndPlayVoicemail();

      queryAndUpdateVoicemailStatusAlert();

    }

  }



    queryAndUpdateVoicemailStatusAlert();

  /** Shows the view when there are no voicemails to be displayed * */

  private void showEmptyVoicemailFragmentView() {

    LogUtil.enterBlock("NewVoicemailFragmentListener.showEmptyVoicemailFragmentView");



    showView(emptyContentView);



    emptyContentView.setDescription((R.string.empty_voicemail_tab_text));

    emptyContentView.setImage(R.drawable.quantum_ic_schedule_vd_theme_24);

  }



  private void showView(View view) {

    LogUtil.i("NewVoicemailFragmentListener.showView", "Showing view: " + view);

    emptyContentView.setVisibility(view == emptyContentView ? View.VISIBLE : View.GONE);

    recyclerView.setVisibility(view == recyclerView ? View.VISIBLE : View.GONE);

  }



  private void registerRefreshAnnotatedCallLogReceiver() {