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

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

Merge changes Ic19643f4,I4cb7c234,If4e1f7c1,I38facbaa 

* changes:
  Use voicemail image for empty voicemail tab and update color
  Implemented DialerFloatingActionButton
  Instead of just cancelling loaders, reset them as well.
  Update RTT icon on ringing screen.
parents 8ddc8018 6c81c662

assets/quantum/res/drawable/quantum_ic_rtt_vd_theme_24.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24.0"

    android:viewportHeight="24.0"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/white"

      android:pathData="M9.03,3l-1.11,7.07h2.62l0.7,-4.5h2.58L11.8,18.43L9.47,18.43L9.06,21h7.27l0.4,-2.57h-2.35l2,-12.86h2.58l-0.71,4.5h2.65L22,3L9.03,3zM8,5L4,5l-0.31,2h4L8,5zM7.39,9h-4l-0.31,2h4l0.31,-2zM8.31,17h-6L2,19h6l0.31,-2zM8.93,13h-6l-0.31,2h6.01l0.3,-2z"/>

</vector>
 
 No newline at end of file

java/com/android/dialer/app/list/PhoneFavoriteTileView.java

+4 −1
Original line number Diff line number Diff line
@@ -199,9 +199,12 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { 
   */

  private void sendViewNotification(Context context, Uri contactUri) {

    if (loader != null) {

      loader.cancelLoad();

      // Cancels the current load if it's running and clears up any memory if it's using any.

      loader.reset();

    }

    loader = new ContactLoader(context, contactUri, true /* postViewNotification */);

    // Immediately release anything we're holding in memory

    loader.registerListener(0, (loader1, contact) -> loader.reset());

    loader.startLoading();

  }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ public class MainSearchController implements SearchBarListener { 
    }

    searchFragment.setQuery("", CallInitiationType.Type.DIALPAD);



    // Split the transactions so that the dialpad fragment isn't popped off the stack when we exit

    // search. We do this so that the dialpad actually animates down instead of just disappearing.

    transaction.commit();

    transaction = mainActivity.getFragmentManager().beginTransaction();



    // Show Dialpad

    if (getDialpadFragment() == null) {

      DialpadFragment dialpadFragment = new DialpadFragment();

java/com/android/dialer/main/impl/res/layout/main_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
        android:layout_height="match_parent"

        android:layout_above="@+id/bottom_nav_bar"/>



    <android.support.design.widget.FloatingActionButton

    <com.android.dialer.widget.DialerFloatingActionButton

        android:id="@+id/fab"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ public final class NewVoicemailFragment extends Fragment implements LoaderCallba 
    showView(emptyContentView);



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

    emptyContentView.setImage(R.drawable.quantum_ic_schedule_vd_theme_24);

    emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24);

    emptyContentView.setImageTint(R.color.empty_voicemail_icon_tint_color, null);

  }



  private void showView(View view) {