Snap for 4707145 from 7a94e767a75a05fb26f02d251df2073fc2ba2b9f to qt-release (6d2862bd) · Commits · e / os / android_packages_apps_Dialer

Android.mk

+10 −5

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,8 @@ EXCLUDE_FILES += \

	# Exclude rootcomponentgenerator		# Exclude rootcomponentgenerator
	EXCLUDE_FILES += \		EXCLUDE_FILES += \
	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/processor)		$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
			$(call all-java-files-under, $(BASE_DIR)/dialer/inject/demo)

	# Exclude build variants for now		# Exclude build variants for now
	EXCLUDE_FILES += \		EXCLUDE_FILES += \
	@@ -154,7 +155,7 @@ LOCAL_ANNOTATION_PROCESSORS := \
	dialer-rootcomponentprocessor		dialer-rootcomponentprocessor

	LOCAL_ANNOTATION_PROCESSOR_CLASSES := \		LOCAL_ANNOTATION_PROCESSOR_CLASSES := \
	com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.processor.RootComponentProcessor		com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.RootComponentProcessor

	# Begin Bug: 37077388		# Begin Bug: 37077388
	LOCAL_DX_FLAGS := --multi-dex		LOCAL_DX_FLAGS := --multi-dex
	@@ -436,9 +437,13 @@ LOCAL_IS_HOST_MODULE := true
	BASE_DIR := java/com/android		BASE_DIR := java/com/android

	LOCAL_SRC_FILES := \		LOCAL_SRC_FILES := \
	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/annotation) \		$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
	$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator/processor)		$(BASE_DIR)/dialer/inject/DialerRootComponent.java \
			$(BASE_DIR)/dialer/inject/DialerVariant.java \
			$(BASE_DIR)/dialer/inject/HasRootComponent.java \
			$(BASE_DIR)/dialer/inject/IncludeInDialerRoot.java \
			$(BASE_DIR)/dialer/inject/InstallIn.java \
			$(BASE_DIR)/dialer/inject/RootComponentGeneratorMetadata.java

	LOCAL_STATIC_JAVA_LIBRARIES := \		LOCAL_STATIC_JAVA_LIBRARIES := \
	dialer-guava \		dialer-guava \

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,7 @@ import com.android.dialer.util.PermissionsUtil;
	import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;		import com.android.dialer.voicemail.listui.error.VoicemailErrorMessageCreator;
	import com.android.dialer.voicemail.listui.error.VoicemailStatus;		import com.android.dialer.voicemail.listui.error.VoicemailStatus;
	import com.android.dialer.voicemail.listui.error.VoicemailStatusWorker;		import com.android.dialer.voicemail.listui.error.VoicemailStatusWorker;
			import com.android.dialer.widget.EmptyContentView;
	import java.util.List;		import java.util.List;

	public class VisualVoicemailCallLogFragment extends CallLogFragment {		public class VisualVoicemailCallLogFragment extends CallLogFragment {
	@@ -110,6 +111,9 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment {
	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {		public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
	View view = inflater.inflate(R.layout.call_log_fragment, container, false);		View view = inflater.inflate(R.layout.call_log_fragment, container, false);
	setupView(view);		setupView(view);
			EmptyContentView emptyContentView = view.findViewById(R.id.empty_list_view);
			emptyContentView.setImage(R.drawable.quantum_ic_voicemail_vd_theme_24);
			emptyContentView.setImageTint(R.color.empty_voicemail_icon_tint_color, null);
	return view;		return view;
	}		}

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

+4 −20

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@ package com.android.dialer.app.list;

	import android.app.Fragment;		import android.app.Fragment;
	import android.app.FragmentManager;		import android.app.FragmentManager;
	import android.content.Context;
	import android.support.annotation.IntDef;		import android.support.annotation.IntDef;
	import android.support.v13.app.FragmentPagerAdapter;		import android.support.v13.app.FragmentPagerAdapter;
	import android.view.ViewGroup;		import android.view.ViewGroup;
	@@ -26,11 +25,9 @@ import com.android.dialer.app.calllog.CallLogFragment;
	import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;		import com.android.dialer.app.calllog.VisualVoicemailCallLogFragment;
	import com.android.dialer.common.Assert;		import com.android.dialer.common.Assert;
	import com.android.dialer.common.LogUtil;		import com.android.dialer.common.LogUtil;
	import com.android.dialer.configprovider.ConfigProviderBindings;
	import com.android.dialer.contactsfragment.ContactsFragment;		import com.android.dialer.contactsfragment.ContactsFragment;
	import com.android.dialer.contactsfragment.ContactsFragment.Header;		import com.android.dialer.contactsfragment.ContactsFragment.Header;
	import com.android.dialer.database.CallLogQueryHandler;		import com.android.dialer.database.CallLogQueryHandler;
	import com.android.dialer.speeddial.SpeedDialFragment;
	import com.android.dialer.util.ViewUtil;		import com.android.dialer.util.ViewUtil;
	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	@@ -55,9 +52,7 @@ public class DialtactsPagerAdapter extends FragmentPagerAdapter {

	private final List<Fragment> fragments = new ArrayList<>();		private final List<Fragment> fragments = new ArrayList<>();
	private final String[] tabTitles;		private final String[] tabTitles;
	private final boolean useNewSpeedDialTab;
	private OldSpeedDialFragment oldSpeedDialFragment;		private OldSpeedDialFragment oldSpeedDialFragment;
	private SpeedDialFragment speedDialFragment;
	private CallLogFragment callLogFragment;		private CallLogFragment callLogFragment;
	private ContactsFragment contactsFragment;		private ContactsFragment contactsFragment;
	private CallLogFragment voicemailFragment;		private CallLogFragment voicemailFragment;
	@@ -65,10 +60,8 @@ public class DialtactsPagerAdapter extends FragmentPagerAdapter {
	private boolean hasActiveVoicemailProvider;		private boolean hasActiveVoicemailProvider;

	public DialtactsPagerAdapter(		public DialtactsPagerAdapter(
	Context context, FragmentManager fm, String[] tabTitles, boolean hasVoicemailProvider) {		FragmentManager fm, String[] tabTitles, boolean hasVoicemailProvider) {
	super(fm);		super(fm);
	useNewSpeedDialTab =
	ConfigProviderBindings.get(context).getBoolean("enable_new_favorites_tab", false);
	this.tabTitles = tabTitles;		this.tabTitles = tabTitles;
	hasActiveVoicemailProvider = hasVoicemailProvider;		hasActiveVoicemailProvider = hasVoicemailProvider;
	fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));		fragments.addAll(Collections.nCopies(TAB_COUNT_WITH_VOICEMAIL, null));
	@@ -84,17 +77,10 @@ public class DialtactsPagerAdapter extends FragmentPagerAdapter {
	LogUtil.d("ViewPagerAdapter.getItem", "position: %d", position);		LogUtil.d("ViewPagerAdapter.getItem", "position: %d", position);
	switch (getRtlPosition(position)) {		switch (getRtlPosition(position)) {
	case TAB_INDEX_SPEED_DIAL:		case TAB_INDEX_SPEED_DIAL:
	if (useNewSpeedDialTab) {
	if (speedDialFragment == null) {
	speedDialFragment = SpeedDialFragment.newInstance();
	}
	return speedDialFragment;
	} else {
	if (oldSpeedDialFragment == null) {		if (oldSpeedDialFragment == null) {
	oldSpeedDialFragment = new OldSpeedDialFragment();		oldSpeedDialFragment = new OldSpeedDialFragment();
	}		}
	return oldSpeedDialFragment;		return oldSpeedDialFragment;
	}
	case TAB_INDEX_HISTORY:		case TAB_INDEX_HISTORY:
	if (callLogFragment == null) {		if (callLogFragment == null) {
	callLogFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);		callLogFragment = new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);
	@@ -128,8 +114,6 @@ public class DialtactsPagerAdapter extends FragmentPagerAdapter {
	final Fragment fragment = (Fragment) super.instantiateItem(container, position);		final Fragment fragment = (Fragment) super.instantiateItem(container, position);
	if (fragment instanceof OldSpeedDialFragment) {		if (fragment instanceof OldSpeedDialFragment) {
	oldSpeedDialFragment = (OldSpeedDialFragment) fragment;		oldSpeedDialFragment = (OldSpeedDialFragment) fragment;
	} else if (fragment instanceof SpeedDialFragment) {
	speedDialFragment = (SpeedDialFragment) fragment;
	} else if (fragment instanceof CallLogFragment && position == TAB_INDEX_HISTORY) {		} else if (fragment instanceof CallLogFragment && position == TAB_INDEX_HISTORY) {
	callLogFragment = (CallLogFragment) fragment;		callLogFragment = (CallLogFragment) fragment;
	} else if (fragment instanceof ContactsFragment) {		} else if (fragment instanceof ContactsFragment) {

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

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,6 @@ import com.android.dialer.logging.Logger;
	import com.android.dialer.logging.ScreenEvent;		import com.android.dialer.logging.ScreenEvent;
	import com.android.dialer.logging.UiAction;		import com.android.dialer.logging.UiAction;
	import com.android.dialer.performancereport.PerformanceReport;		import com.android.dialer.performancereport.PerformanceReport;
	import com.android.dialer.speeddial.SpeedDialFragment;
	import com.android.dialer.util.PermissionsUtil;		import com.android.dialer.util.PermissionsUtil;
	import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;		import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler;
	import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;		import com.android.dialer.voicemail.listui.error.VoicemailStatusCorruptionHandler.Source;
	@@ -199,7 +198,6 @@ public class ListsFragment extends Fragment
	viewPager = (DialerViewPager) parentView.findViewById(R.id.lists_pager);		viewPager = (DialerViewPager) parentView.findViewById(R.id.lists_pager);
	adapter =		adapter =
	new DialtactsPagerAdapter(		new DialtactsPagerAdapter(
	getContext(),
	getChildFragmentManager(),		getChildFragmentManager(),
	tabTitles,		tabTitles,
	prefs.getBoolean(		prefs.getBoolean(
	@@ -456,11 +454,10 @@ public class ListsFragment extends Fragment
	}		}

	public boolean hasFrequents() {		public boolean hasFrequents() {
	Fragment page =		OldSpeedDialFragment page =
			(OldSpeedDialFragment)
	adapter.getItem(adapter.getRtlPosition(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL));		adapter.getItem(adapter.getRtlPosition(DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL));
	return page instanceof OldSpeedDialFragment		return page.hasFrequents();
	? ((OldSpeedDialFragment) page).hasFrequents()
	: ((SpeedDialFragment) page).hasFrequents();
	}		}

	public RemoveView getRemoveView() {		public RemoveView getRemoveView() {

java/com/android/dialer/inject/ContextModule.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import dagger.Provides;

	/** Provides the singleton application context object. */		/** Provides the singleton application context object. */
	@Module		@Module
			@InstallIn(variants = {DialerVariant.DIALER_DEMO, DialerVariant.DIALER_TEST})
	public final class ContextModule {		public final class ContextModule {

	@NonNull private final Context context;		@NonNull private final Context context;