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

Commit bb6a02d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I43cc987c,I99ef5ccf,Icae34dd6,I161b5127,I4740c0f4, ... 

* changes:
  Update title of after call spam dialog.
  Used VectorDrawable for Blocked Numbers
  Finish AudioRouteSelectorActivity when all calls disconnect.
  Add LookupUri to PeopApiPhoneLookupInfo
  Implemented NUI menu items.
  Implemented GoogleMainSearchController to customize menu to GoogleDialer.
  Show reject hint text for all incoming calls
parents 02f601bb 33e19a9c

java/com/android/dialer/glidephotomanager/impl/GlidePhotoManagerImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ public class GlidePhotoManagerImpl implements GlidePhotoManager { 
  }



  private GlideRequest<Drawable> buildRequest(GlideRequests requestManager, PhotoInfo photoInfo) {

    // Warning: Glide ignores extra attributes on BitmapDrawable such as tint and draw the bitmap

    // directly so be sure not to set tint in the XML of any drawable referenced below.



    // The spam status takes precedence over whether the number is blocked.

    if (photoInfo.isSpam()) {

      return requestManager.load(R.drawable.ic_report_red_48dp);

java/com/android/dialer/glidephotomanager/impl/res/drawable-xxxhdpi/ic_block_black_48dp.png

deleted100644 → 0
−2.47 KiB
Loading image diff...

java/com/android/dialer/glidephotomanager/impl/res/drawable/ic_block_grey_48dp.xml

+10 −3
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<bitmap xmlns:android="http://schemas.android.com/apk/res/android"

    android:src="@drawable/ic_block_black_48dp"

    android:tint="#757575" />
 
 No newline at end of file
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path android:pathData="M0 0h24v24H0z"/>

  <path

      android:fillColor="#757575"

      android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM4 12c0-4.42 3.58-8 8-8 1.85 0 3.55.63 4.9 1.69L5.69 16.9C4.63 15.55 4 13.85 4 12zm8 8c-1.85 0-3.55-.63-4.9-1.69L18.31 7.1C19.37 8.45 20 10.15 20 12c0 4.42-3.58 8-8 8z"/>

</vector>
 
 No newline at end of file

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

+21 −8
Original line number Diff line number Diff line
@@ -25,10 +25,13 @@ import android.support.annotation.Nullable; 
import android.support.design.widget.FloatingActionButton;

import android.support.v7.app.AppCompatActivity;

import android.text.TextUtils;

import android.view.MenuItem;

import android.view.View;

import android.view.animation.Animation;

import android.view.animation.Animation.AnimationListener;

import android.widget.Toast;

import com.android.contacts.common.dialog.ClearFrequentsDialog;

import com.android.dialer.app.settings.DialerSettingsActivity;

import com.android.dialer.callintent.CallInitiationType;

import com.android.dialer.common.Assert;

import com.android.dialer.common.LogUtil;
@@ -36,6 +39,8 @@ import com.android.dialer.constants.ActivityRequestCodes; 
import com.android.dialer.dialpadview.DialpadFragment;

import com.android.dialer.dialpadview.DialpadFragment.DialpadListener;

import com.android.dialer.dialpadview.DialpadFragment.OnDialpadQueryChangedListener;

import com.android.dialer.logging.Logger;

import com.android.dialer.logging.ScreenEvent;

import com.android.dialer.main.impl.bottomnav.BottomNavBar;

import com.android.dialer.main.impl.toolbar.MainToolbar;

import com.android.dialer.main.impl.toolbar.SearchBarListener;
@@ -58,7 +63,7 @@ import java.util.ArrayList; 
 *

 * @see #onBackPressed()

 */

final class MainSearchController implements SearchBarListener {

public class MainSearchController implements SearchBarListener {



  private static final String KEY_IS_FAB_HIDDEN = "is_fab_hidden";

  private static final String KEY_CURRENT_TAB = "current_tab";
@@ -74,7 +79,7 @@ final class MainSearchController implements SearchBarListener { 
  private final FloatingActionButton fab;

  private final MainToolbar toolbar;



  MainSearchController(

  public MainSearchController(

      MainActivity mainActivity,

      BottomNavBar bottomNav,

      FloatingActionButton fab,
@@ -324,6 +329,20 @@ final class MainSearchController implements SearchBarListener { 
    }

  }



  @Override

  public boolean onMenuItemClicked(MenuItem menuItem) {

    if (menuItem.getItemId() == R.id.settings) {

      mainActivity.startActivity(new Intent(mainActivity, DialerSettingsActivity.class));

      Logger.get(mainActivity).logScreenView(ScreenEvent.Type.SETTINGS, mainActivity);

      return true;

    } else if (menuItem.getItemId() == R.id.clear_frequents) {

      ClearFrequentsDialog.show(mainActivity.getFragmentManager());

      Logger.get(mainActivity).logScreenView(ScreenEvent.Type.CLEAR_FREQUENTS, mainActivity);

      return true;

    }

    return false;

  }



  public void onVoiceResults(int resultCode, Intent data) {

    if (resultCode == AppCompatActivity.RESULT_OK) {

      ArrayList<String> matches = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS);
@@ -338,12 +357,6 @@ final class MainSearchController implements SearchBarListener { 
    }

  }



  @Override

  public void openSettings() {}



  @Override

  public void sendFeedback() {}



  public void onSaveInstanceState(Bundle bundle) {

    bundle.putBoolean(KEY_IS_FAB_HIDDEN, !fab.isShown());

    bundle.putInt(KEY_CURRENT_TAB, bottomNav.getSelectedTab());

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

+6 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
            mainActivity, mainActivity.getContentResolver(), bottomNav, toolbar);

    bottomNav.addOnTabSelectedListener(callLogFragmentListener);



    searchController = new MainSearchController(mainActivity, bottomNav, fab, toolbar);

    searchController = getNewMainSearchController(bottomNav, fab, toolbar);

    toolbar.setSearchBarListener(searchController);



    onDialpadQueryChangedListener = new MainOnDialpadQueryChangedListener(searchController);
@@ -355,6 +355,11 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen 
    }

  }



  public MainSearchController getNewMainSearchController(

      BottomNavBar bottomNavBar, FloatingActionButton fab, MainToolbar mainToolbar) {

    return new MainSearchController(mainActivity, bottomNavBar, fab, mainToolbar);

  }



  /** @see OnContactSelectedListener */

  private static final class MainOnContactSelectedListener implements OnContactSelectedListener {