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

Commit 089df23c authored by Brandon Maxwell's avatar Brandon Maxwell
Browse files

Backporting Select sim dialog icons 

The getIcon method doesn't exist prior to M and was causing crashes on
multi-sim devices.

Bug=25776171
Change-Id: I2072bbe99e617fbe8387e5220f437c144bd592a4
parent efa7268b

src/com/android/contacts/common/compat/PhoneAccountCompat.java

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

 * Copyright (C) 2015 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.contacts.common.compat;



import android.content.Context;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Icon;

import android.support.annotation.Nullable;

import android.telecom.PhoneAccount;

import android.util.Log;



/**

 * Compatiblity class for {@link android.telecom.PhoneAccount}

 */

public class PhoneAccountCompat {



    private static final String TAG = PhoneAccountCompat.class.getSimpleName();



    /**

     * Gets the {@link Icon} associated with the given {@link PhoneAccount}

     *

     * @param phoneAccount the PhoneAccount from which to retrieve the Icon

     * @return the Icon, or null

     */

    @Nullable

    public static Icon getIcon(@Nullable PhoneAccount phoneAccount) {

        if (phoneAccount == null) {

            return null;

        }



        if (CompatUtils.isMarshmallowCompatible()) {

            return phoneAccount.getIcon();

        }



        return null;

    }



    /**

     * Builds and returns an icon {@code Drawable} to represent this {@code PhoneAccount} in a user

     * interface.

     *

     * @param phoneAccount the PhoneAccount from which to build the icon.

     * @param context A {@code Context} to use for loading Drawables.

     *

     * @return An icon for this PhoneAccount, or null

     */

    @Nullable

    public static Drawable createIconDrawable(@Nullable PhoneAccount phoneAccount,

            @Nullable Context context) {

        if (phoneAccount == null || context == null) {

            return null;

        }



        if (CompatUtils.isMarshmallowCompatible()) {

            return createIconDrawableMarshmallow(phoneAccount, context);

        }



        if (CompatUtils.isLollipopMr1Compatible()) {

            return createIconDrawableLollipopMr1(phoneAccount, context);

        }

        return null;

    }



    @Nullable

    private static Drawable createIconDrawableMarshmallow(PhoneAccount phoneAccount,

            Context context) {

        Icon accountIcon = getIcon(phoneAccount);

        if (accountIcon == null) {

            return null;

        }

        return accountIcon.loadDrawable(context);

    }



    @Nullable

    private static Drawable createIconDrawableLollipopMr1(PhoneAccount phoneAccount,

            Context context) {

        try {

            return (Drawable) PhoneAccount.class.getMethod("createIconDrawable", Context.class)

                    .invoke(phoneAccount, context);

        } catch (ReflectiveOperationException e) {

            return null;

        } catch (Throwable t) {

            Log.e(TAG, "Unexpected exception when attempting to call "

                    + "android.telecom.PhoneAccount#createIconDrawable", t);

            return null;

        }

    }

}

src/com/android/contacts/common/widget/SelectPhoneAccountDialogFragment.java

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.Dialog; 
import android.app.DialogFragment;

import android.content.Context;

import android.content.DialogInterface;

import android.graphics.drawable.Icon;

import android.os.Bundle;

import android.os.Handler;

import android.os.ResultReceiver;
@@ -40,6 +41,7 @@ import android.widget.ListAdapter; 
import android.widget.TextView;



import com.android.contacts.common.R;

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

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



import java.util.ArrayList;
@@ -257,8 +259,8 @@ public class SelectPhoneAccountDialogFragment extends DialogFragment { 
                        PhoneNumberUtilsCompat.createTtsSpannable(

                                account.getAddress().getSchemeSpecificPart()));

            }

            holder.imageView.setImageDrawable(account.getIcon() != null

                    ? account.getIcon().loadDrawable(getContext()) : null);

            holder.imageView.setImageDrawable(PhoneAccountCompat.createIconDrawable(account,

                    getContext()));

            return rowView;

        }