Merge tag 'android-6.0.1_r3' of... (45b869a8) · Commits · e / os / android_packages_apps_Dialer

src/com/android/dialer/calllog/CallLogActivity.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ import com.android.contacts.common.util.PermissionsUtil;
		import com.android.contacts.commonbind.analytics.AnalyticsUtil;
		import com.android.dialer.DialtactsActivity;
		import com.android.dialer.R;
		import com.android.dialer.util.DialerUtils;
		import com.android.dialer.voicemail.VoicemailStatusHelper;
		import com.android.dialer.voicemail.VoicemailStatusHelperImpl;

		@@ -63,9 +64,14 @@ public class CallLogActivity extends Activity implements ViewPager.OnPageChangeL
		super(fm);
		}

		@Override
		public long getItemId(int position) {
		return getRtlPosition(position);
		}

		@Override
		public Fragment getItem(int position) {
		switch (position) {
		switch (getRtlPosition(position)) {
		case TAB_INDEX_ALL:
		return new CallLogFragment(CallLogQueryHandler.CALL_TYPE_ALL);
		case TAB_INDEX_MISSED:
		@@ -229,4 +235,11 @@ public class CallLogActivity extends Activity implements ViewPager.OnPageChangeL
		}
		return null;
		}

		private int getRtlPosition(int position) {
		if (DialerUtils.isRtl()) {
		return mViewPagerAdapter.getCount() - 1 - position;
		}
		return position;
		}
		}

+7 −3

Original line number	Diff line number	Diff line
		@@ -155,9 +155,13 @@ public class CallLogAsyncTaskUtil {
		boolean isVoicemail = PhoneNumberUtil.isVoicemailNumber(context, accountHandle, number);
		boolean shouldLookupNumber =
		PhoneNumberUtil.canPlaceCallsTo(number, numberPresentation) && !isVoicemail;
		ContactInfo info = shouldLookupNumber
		? contactInfoHelper.lookupNumber(number, countryIso)
		: ContactInfo.EMPTY;

		ContactInfo info = ContactInfo.EMPTY;
		if (shouldLookupNumber) {
		ContactInfo lookupInfo = contactInfoHelper.lookupNumber(number, countryIso);
		info = lookupInfo != null ? lookupInfo : ContactInfo.EMPTY;
		}

		PhoneCallDetails details = new PhoneCallDetails(
		context, number, numberPresentation, info.formattedNumber, isVoicemail);

+5 −1

Original line number	Diff line number	Diff line
		@@ -587,6 +587,10 @@ public class VoicemailPlaybackPresenter
		* playing.
		*/
		public void resumePlayback() {
		if (mView == null \|\| mContext == null) {
		return;
		}

		if (!mIsPrepared) {
		// If we haven't downloaded the voicemail yet, attempt to download it.
		checkForContent();
		@@ -597,7 +601,7 @@ public class VoicemailPlaybackPresenter

		mIsPlaying = true;

		if (!mMediaPlayer.isPlaying()) {
		if (mMediaPlayer != null && !mMediaPlayer.isPlaying()) {
		// Clamp the start position between 0 and the duration.
		mPosition = Math.max(0, Math.min(mPosition, mDuration.get()));
		mMediaPlayer.seekTo(mPosition);