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

Commit aae15596 authored by Brandon Maxwell's avatar Brandon Maxwell Committed by Android (Google) Code Review
Browse files

Merge "Removing hardcoded database column name" into nyc-dev

parents 4cdae092 17df9323

src-N/com/android/dialer/compat/CallsSdkCompat.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



package com.android.dialer.compat;



import android.provider.CallLog;



public class CallsSdkCompat {



    public static final String POST_DIAL_DIGITS = CallLog.Calls.POST_DIAL_DIGITS;

}

src-pre-N/com/android/dialer/compat/CallsSdkCompat.java

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */



package com.android.dialer.compat;



import android.support.annotation.Nullable;



public class CallsSdkCompat {



    @Nullable public static final String POST_DIAL_DIGITS = null;

}

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

+4 −6
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 


package com.android.dialer.calllog;



import com.android.contacts.common.util.PermissionsUtil;



import com.android.dialer.DialtactsActivity;

import com.android.dialer.database.VoicemailArchiveContract;

import com.google.common.annotations.VisibleForTesting;



import android.content.Context;
@@ -40,7 +36,6 @@ import android.telephony.PhoneNumberUtils; 
import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View.AccessibilityDelegate;
@@ -48,15 +43,18 @@ import android.view.ViewGroup; 
import android.view.accessibility.AccessibilityEvent;



import com.android.contacts.common.ContactsUtils;

import com.android.contacts.common.compat.CompatUtils;

import com.android.contacts.common.compat.PhoneNumberUtilsCompat;

import com.android.contacts.common.preference.ContactsPreferences;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.dialer.DialtactsActivity;

import com.android.dialer.PhoneCallDetails;

import com.android.dialer.R;

import com.android.dialer.calllog.calllogcache.CallLogCache;

import com.android.dialer.contactinfo.ContactInfoCache;

import com.android.dialer.contactinfo.ContactInfoCache.OnContactInfoChangedListener;

import com.android.dialer.database.FilteredNumberAsyncQueryHandler;

import com.android.dialer.database.VoicemailArchiveContract;

import com.android.dialer.filterednumber.BlockNumberDialogFragment.Callback;

import com.android.dialer.logging.InteractionEvent;

import com.android.dialer.logging.Logger;
@@ -492,7 +490,7 @@ public class CallLogAdapter extends GroupingListAdapter 
        int count = getGroupSize(position);



        final String number = c.getString(CallLogQuery.NUMBER);

        final String postDialDigits = PhoneNumberDisplayUtil.canShowPostDial()

        final String postDialDigits = CompatUtils.isNCompatible()

                && mActivityType != ACTIVITY_TYPE_ARCHIVE ?

                c.getString(CallLogQuery.POST_DIAL_DIGITS) : "";

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

+11 −11
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.dialer.calllog;



import com.google.common.annotations.VisibleForTesting;



import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;
@@ -30,18 +32,16 @@ import android.text.TextUtils; 
import android.util.Log;



import com.android.contacts.common.GeoUtil;

import com.android.contacts.common.compat.CompatUtils;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.dialer.DialtactsActivity;

import com.android.dialer.PhoneCallDetails;

import com.android.dialer.compat.CallsSdkCompat;

import com.android.dialer.database.VoicemailArchiveContract;

import com.android.dialer.util.AppCompatConstants;

import com.android.dialer.util.AsyncTaskExecutor;

import com.android.dialer.util.AsyncTaskExecutors;

import com.android.dialer.util.PhoneNumberUtil;

import com.android.dialer.util.TelecomUtil;



import com.google.common.annotations.VisibleForTesting;



import java.util.ArrayList;

import java.util.Arrays;
@@ -94,8 +94,8 @@ public class CallLogAsyncTaskUtil { 
        static {

            ArrayList<String> projectionList = new ArrayList<>();

            projectionList.addAll(Arrays.asList(CALL_LOG_PROJECTION_INTERNAL));

            if (PhoneNumberDisplayUtil.canShowPostDial()) {

                projectionList.add(AppCompatConstants.POST_DIAL_DIGITS);

            if (CompatUtils.isNCompatible()) {

                projectionList.add(CallsSdkCompat.POST_DIAL_DIGITS);

            }

            projectionList.trimToSize();

            CALL_LOG_PROJECTION = projectionList.toArray(new String[projectionList.size()]);
@@ -113,13 +113,13 @@ public class CallLogAsyncTaskUtil { 
    }



    public interface CallLogAsyncTaskListener {

        public void onDeleteCall();

        public void onDeleteVoicemail();

        public void onGetCallDetails(PhoneCallDetails[] details);

        void onDeleteCall();

        void onDeleteVoicemail();

        void onGetCallDetails(PhoneCallDetails[] details);

    }



    public interface OnCallLogQueryFinishedListener {

        public void onQueryFinished(boolean hasEntry);

        void onQueryFinished(boolean hasEntry);

    }



    // Try to identify if a call log entry corresponds to a number which was blocked. We match by
@@ -185,7 +185,7 @@ public class CallLogAsyncTaskUtil { 
            // Read call log.

            final String countryIso = cursor.getString(CallDetailQuery.COUNTRY_ISO_COLUMN_INDEX);

            final String number = cursor.getString(CallDetailQuery.NUMBER_COLUMN_INDEX);

            final String postDialDigits = PhoneNumberDisplayUtil.canShowPostDial()

            final String postDialDigits = CompatUtils.isNCompatible()

                    ? cursor.getString(CallDetailQuery.POST_DIAL_DIGITS) : "";

            final int numberPresentation =

                    cursor.getInt(CallDetailQuery.NUMBER_PRESENTATION_COLUMN_INDEX);

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

+6 −5
Original line number Diff line number Diff line
@@ -16,17 +16,18 @@ 


package com.android.dialer.calllog;



import com.google.common.annotations.VisibleForTesting;



import android.database.Cursor;

import android.telephony.PhoneNumberUtils;

import android.text.format.Time;

import android.text.TextUtils;

import android.text.format.Time;



import com.android.contacts.common.compat.CompatUtils;

import com.android.contacts.common.util.DateUtils;

import com.android.contacts.common.util.PhoneNumberHelper;

import com.android.dialer.util.AppCompatConstants;



import com.google.common.annotations.VisibleForTesting;



/**

 * Groups together calls in the call log.  The primary grouping attempts to group together calls

 * to and from the same number into a single row on the call log.
@@ -122,7 +123,7 @@ public class CallLogGroupBuilder { 


        // Instantiate the group values to those of the first call in the cursor.

        String groupNumber = cursor.getString(CallLogQuery.NUMBER);

        String groupPostDialDigits = PhoneNumberDisplayUtil.canShowPostDial()

        String groupPostDialDigits = CompatUtils.isNCompatible()

                ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : "";

        int groupCallType = cursor.getInt(CallLogQuery.CALL_TYPE);

        String groupAccountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);
@@ -138,7 +139,7 @@ public class CallLogGroupBuilder { 
        while (cursor.moveToNext()) {

            // Obtain the values for the current call to group.

            number = cursor.getString(CallLogQuery.NUMBER);

            numberPostDialDigits = PhoneNumberDisplayUtil.canShowPostDial()

            numberPostDialDigits = CompatUtils.isNCompatible()

                    ? cursor.getString(CallLogQuery.POST_DIAL_DIGITS) : "";

            callType = cursor.getInt(CallLogQuery.CALL_TYPE);

            accountComponentName = cursor.getString(CallLogQuery.ACCOUNT_COMPONENT_NAME);