Merge changes I5286112b,Ic5701d67 am: 2afb85a26b am: c18dd92433 (4a8fb672) · Commits · e / os / android_packages_apps_Dialer

assets/quantum/res/drawable/quantum_ic_access_time_vd_theme_24.xml

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		<!--
		~ 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="24dp"
		android:height="24dp"
		android:viewportWidth="24.0"
		android:viewportHeight="24.0"
		android:tint="?attr/colorControlNormal">
		<path
		android:fillColor="@android:color/white"
		android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7L11,7v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
		</vector>
		No newline at end of file

+0 −7

Original line number	Diff line number	Diff line
		@@ -72,13 +72,6 @@ public final class VoicemailPopulator {
		.setDurationSeconds(0)
		.setPhoneAccountComponentName(componentName)
		.setIsRead(true),
		// Short number.
		Voicemail.builder()
		.setPhoneNumber("711")
		.setTranscription("This is a short voicemail.")
		.setDurationSeconds(12)
		.setPhoneAccountComponentName(componentName)
		.setIsRead(true),
		};

		@WorkerThread

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import com.android.dialer.interactions.PhoneNumberInteraction.DisambigDialogDism
		import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorCode;
		import com.android.dialer.interactions.PhoneNumberInteraction.InteractionErrorListener;
		import com.android.dialer.main.MainActivityPeer;
		import com.android.dialer.main.impl.BottomNavBar.TabIndex;
		import com.android.dialer.main.impl.bottomnav.BottomNavBar.TabIndex;
		import com.android.dialer.util.TransactionSafeActivity;

		/** This is the main activity for dialer. It hosts favorites, call log, search, dialpad, etc... */

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ 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.main.impl.bottomnav.BottomNavBar;
		import com.android.dialer.main.impl.toolbar.MainToolbar;
		import com.android.dialer.main.impl.toolbar.SearchBarListener;
		import com.android.dialer.searchfragment.list.NewSearchFragment;

+3 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,9 @@ import android.support.v4.app.FragmentManager;
		import android.support.v4.app.FragmentTransaction;
		import com.android.dialer.calllog.ui.NewCallLogFragment;
		import com.android.dialer.main.MainActivityPeer;
		import com.android.dialer.main.impl.BottomNavBar.OnBottomNavTabSelectedListener;
		import com.android.dialer.main.impl.BottomNavBar.TabIndex;
		import com.android.dialer.main.impl.bottomnav.BottomNavBar;
		import com.android.dialer.main.impl.bottomnav.BottomNavBar.OnBottomNavTabSelectedListener;
		import com.android.dialer.main.impl.bottomnav.BottomNavBar.TabIndex;
		import com.android.dialer.voicemail.listui.NewVoicemailFragment;

		/** MainActivityPeer that implements the new fragments. */