Revert "Dialer: set new VoLTE icon" (1a017219) · Commits · e / os / android_packages_apps_Dialer

assets/quantum/res/drawable/quantum_ic_hd_vd_lte_theme_24.xml

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="24.0dip"
		android:height="24.0dip"
		android:tint="?colorControlNormal"
		android:viewportWidth="17.0"
		android:viewportHeight="17.0">
		<group android:scaleX="0.8"
		android:scaleY="0.8"
		android:translateX="2.0"
		android:translateY="2.0">
		<clip-path android:pathData="M0.75,0.5h16v16h-16z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M2.251,11L6.057,10.559L7.877,12.379C9.921,11.339 11.597,9.671 12.637,7.62L10.81,5.792L11.25,2H15.23C15.649,9.353 9.603,15.398 2.251,14.979V11Z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M3.147,5.831V6.451H1.297V5.831H3.147ZM1.493,2V6.451H0.75V2H1.493Z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M4.629,2V6.451H3.889V2H4.629ZM5.763,2V2.624H2.768V2H5.763Z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M8.83,5.831V6.451H6.898V5.831H8.83ZM7.093,2V6.451H6.35V2H7.093ZM8.57,3.853V4.464H6.898V3.853H8.57ZM8.811,2V2.624H6.898V2H8.811Z" />
		</group>
		</vector>
		No newline at end of file

assets/quantum/res/drawable/quantum_ic_hd_vd_theme_24.xml

+24 −21

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2017 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="24.0dip"
		android:height="24.0dip"
		android:tint="?colorControlNormal"
		android:viewportWidth="17.0"
		android:viewportHeight="17.0">
		<group android:scaleX="0.8"
		android:scaleY="0.8"
		android:translateX="2.0"
		android:translateY="2.0">
		android:width="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="#ffffff"
		android:pathData="M1.751,11L5.557,10.559L7.377,12.379C9.421,11.339 11.097,9.671 12.137,7.62L10.31,5.792L10.75,2H14.73C15.149,9.353 9.103,15.398 1.751,14.979V11Z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M1.265,5.497V4.994L3.12,2.053H3.814V4.89H4.33V5.497H3.814V6.367H3.172V5.497H1.265ZM1.993,4.89H3.172V3.065H3.133L1.993,4.89Z" />
		<path
		android:fillColor="#ffffff"
		android:pathData="M6.902,6.462C6.521,6.462 6.183,6.371 5.888,6.186C5.597,5.997 5.368,5.734 5.194,5.398C5.029,5.058 4.947,4.662 4.947,4.21C4.947,3.758 5.038,3.366 5.216,3.031C5.394,2.691 5.636,2.428 5.94,2.243C6.243,2.053 6.59,1.959 6.976,1.959C7.449,1.959 7.847,2.066 8.164,2.286C8.489,2.501 8.693,2.807 8.775,3.194L8.138,3.362C8.064,3.121 7.93,2.932 7.73,2.794C7.535,2.652 7.284,2.583 6.972,2.583C6.725,2.583 6.499,2.643 6.291,2.768C6.083,2.893 5.922,3.074 5.801,3.315C5.68,3.556 5.619,3.853 5.619,4.206C5.619,4.555 5.68,4.852 5.797,5.097C5.918,5.338 6.079,5.519 6.278,5.644C6.482,5.768 6.703,5.829 6.946,5.829C7.193,5.829 7.405,5.781 7.583,5.682C7.765,5.583 7.908,5.446 8.012,5.278C8.121,5.106 8.19,4.912 8.212,4.692H6.963V4.124H8.858C8.858,4.499 8.858,4.873 8.858,5.243C8.858,5.618 8.858,5.992 8.858,6.363H8.246V5.76H8.212C8.09,5.971 7.921,6.139 7.7,6.268C7.483,6.397 7.219,6.462 6.902,6.462Z" />
		</group>
		android:fillColor="@android:color/white"
		android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM11,15L9.5,15v-2h-2v2L6,15L6,9h1.5v2.5h2L9.5,9L11,9v6zM13,9h4c0.55,0 1,0.45 1,1v4c0,0.55 -0.45,1 -1,1h-4L13,9zM14.5,13.5h2v-3h-2v3z"/>
		</vector>

java/com/android/dialer/calllogutils/CallTypeIconsView.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import androidx.core.content.res.ResourcesCompat;
		import com.android.dialer.R;
		import com.android.dialer.theme.base.Theme;
		import com.android.dialer.theme.base.ThemeComponent;
		import com.android.dialer.util.CallUtil;
		import java.util.ArrayList;
		import java.util.List;

		@@ -304,8 +303,7 @@ public class CallTypeIconsView extends View {
		largeIcons);
		videoCall = getBitmap(context, R.drawable.quantum_ic_videocam_vd_white_24, iconColor,
		largeIcons);
		hdCall = getBitmap(context, CallUtil.show4gHDIcon(context) ? R.drawable.quantum_ic_hd_vd_theme_24
		: R.drawable.quantum_ic_hd_vd_lte_theme_24, iconColor,
		hdCall = getBitmap(context, R.drawable.quantum_ic_hd_vd_theme_24, iconColor,
		largeIcons);
		wifiCall = getBitmap(context, R.drawable.quantum_ic_signal_wifi_4_bar_vd_theme_24,
		iconColor, largeIcons);

java/com/android/dialer/util/CallUtil.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -17,23 +17,17 @@

		package com.android.dialer.util;

		import android.Manifest;
		import android.annotation.SuppressLint;
		import android.content.Context;
		import android.content.pm.PackageManager;
		import android.net.Uri;
		import android.os.Build;
		import android.telecom.PhoneAccount;
		import android.telecom.PhoneAccountHandle;
		import android.telecom.TelecomManager;
		import android.telephony.CarrierConfigManager;
		import androidx.core.app.ActivityCompat;
		import com.android.dialer.common.LogUtil;
		import com.android.dialer.phonenumberutil.PhoneNumberHelper;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Objects;

		/** Utilities related to calls that can be used by non system apps. */
		public class CallUtil {
		@@ -117,18 +111,6 @@ public class CallUtil {
		return accounts;
		}

		public static boolean show4gHDIcon(Context context) {
		CarrierConfigManager configManager = (CarrierConfigManager) context.getSystemService(
		Context.CARRIER_CONFIG_SERVICE);
		if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE)
		== PackageManager.PERMISSION_GRANTED && Build.VERSION.SDK_INT
		>= Build.VERSION_CODES.R) {
		return Objects.requireNonNull(configManager.getConfig()).getBoolean(
		CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
		}
		return false;
		}

		/**
		* Determines if one of the call capable phone accounts defined supports video calling.
		*

java/com/android/incallui/contactgrid/ContactGridManager.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -356,13 +356,9 @@ public class ContactGridManager {
		bottomTextView.setText(info.label);
		bottomTextView.setAllCaps(info.isSpamIconVisible);
		workIconImageView.setVisibility(info.isWorkIconVisible ? View.VISIBLE : View.GONE);
		int hdIcon = R.drawable.quantum_ic_hd_vd_lte_theme_24;
		if (CallUtil.show4gHDIcon(context)) {
		hdIcon = R.drawable.quantum_ic_hd_vd_theme_24;
		}
		if (hdIconImageView.getVisibility() == View.GONE) {
		if (info.isHdAttemptingIconVisible) {
		hdIconImageView.setImageResource(hdIcon);
		hdIconImageView.setImageResource(R.drawable.asd_hd_icon);
		hdIconImageView.setVisibility(View.VISIBLE);
		hdIconImageView.setActivated(false);
		Drawable drawableCurrent = hdIconImageView.getDrawable().getCurrent();
		@@ -370,7 +366,7 @@ public class ContactGridManager {
		((Animatable) drawableCurrent).start();
		}
		} else if (info.isHdIconVisible) {
		hdIconImageView.setImageResource(hdIcon);
		hdIconImageView.setImageResource(R.drawable.asd_hd_icon);
		hdIconImageView.setVisibility(View.VISIBLE);
		hdIconImageView.setActivated(true);
		}