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

Commit 7f1cc653 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents 515182f7 1dad74cb

assets/quantum/res/drawable/quantum_ic_clear_vd_theme_24.xml

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
<!--

  SPDX-FileCopyrightText: Material Design Authors / Google LLC

  SPDX-License-Identifier: Apache-2.0

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="960"

    android:viewportHeight="960"

    android:tint="?attr/colorControlNormal">

  <path

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

      android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>

</vector>

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

+2 −2
Original line number Diff line number Diff line
@@ -452,8 +452,8 @@ public class CallLogFragment extends Fragment 
  @Override

  public void onDestroy() {

    LogUtil.enterBlock("CallLogFragment.onDestroy");

    getActivity().getContentResolver().unregisterContentObserver(callLogObserver);

    getActivity().getContentResolver().unregisterContentObserver(contactsObserver);

    requireActivity().getContentResolver().unregisterContentObserver(callLogObserver);

    requireActivity().getContentResolver().unregisterContentObserver(contactsObserver);

    if (adapter != null) {

      adapter.changeCursor(null);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ public class PhoneCallDetailsHelper { 
    setNameView(views, details);



    // Bold if not read

    Typeface typeface = details.isRead ? Typeface.SANS_SERIF : Typeface.DEFAULT_BOLD;

    Typeface typeface = details.isRead ? Typeface.DEFAULT : Typeface.DEFAULT_BOLD;

    views.nameView.setTypeface(typeface);

    views.callLocationAndDate.setTypeface(typeface);

    views.callLocationAndDate.setTextColor(

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

+0 −5
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ import android.widget.FrameLayout; 
import android.widget.ImageView;

import android.widget.TextView;



import androidx.core.content.res.ResourcesCompat;



import com.android.dialer.R;



public class RemoveView extends FrameLayout {
@@ -37,7 +35,6 @@ public class RemoveView extends FrameLayout { 
  ImageView removeIcon;

  int unhighlightedColor;

  int highlightedColor;

  Drawable removeDrawable;



  public RemoveView(Context context) {

    super(context);
@@ -59,8 +56,6 @@ public class RemoveView extends FrameLayout { 
    final Resources r = getResources();

    unhighlightedColor = r.getColor(android.R.color.white, getContext().getTheme());

    highlightedColor = r.getColor(R.color.remove_highlighted_text_color, getContext().getTheme());

    removeDrawable = ResourcesCompat.getDrawable(r, R.drawable.quantum_ic_clear_vd_theme_24,

            getContext().getTheme());

  }



  @Override

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

+2 −1
Original line number Diff line number Diff line
@@ -71,7 +71,8 @@ 
              android:layout_height="@dimen/contact_photo_size"

              android:paddingTop="2dp"

              android:nextFocusRight="@id/primary_action_view"

              android:focusable="true"/>

              android:focusable="true"

              android:forceDarkAllowed="false" />



          <ImageView

              android:id="@+id/quick_contact_checkbox"