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

Commit 5538be50 authored by jackqdyulei's avatar jackqdyulei
Browse files

Add account picker to Support Tab 

Add a spinner to select the account for user.

Bug: 32249920
Test: make RunSettingsRoboTests
Change-Id: I372d16ec5ec3230f5f2994d79f4fd27085092236
parent 737ae83a

res/layout/support_account_spinner_item.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     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.

-->



<TextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/text1"

    style="?android:attr/spinnerItemStyle"

    android:singleLine="true"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:ellipsize="marquee"

    android:textAppearance="?android:attr/textAppearanceSmall"

    android:textAlignment="inherit"/>

res/layout/support_escalation_options.xml

+18 −6
Original line number Diff line number Diff line
@@ -34,11 +34,25 @@ 
        android:gravity="center_horizontal"

        android:paddingTop="8dp"

        android:paddingBottom="30dp"

        android:textAppearance="@style/TextAppearance.Small"

        android:textColor="?android:attr/textColorSecondary"/>

        android:textAppearance="?android:attr/textAppearanceSmall"/>

    <TextView

        android:id="@+id/account_request_prefix"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:text="@string/support_account_request_prefix"

        android:textAppearance="?android:attr/textAppearanceSmall"/>

    <Spinner

        android:id="@+id/account_spinner"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="5dp"

        android:layout_marginStart="16dp"

        android:gravity="center_horizontal"/>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="30dp"

        android:gravity="center_horizontal"

        android:orientation="horizontal">

        <LinearLayout
@@ -60,8 +74,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="14dp"

                android:textAppearance="@style/TextAppearance.Small"

                android:textColor="?android:attr/textColorSecondary"/>

                android:textAppearance="?android:attr/textAppearanceSmall"/>

        </LinearLayout>

        <LinearLayout

            android:layout_width="0dp"
@@ -82,8 +95,7 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="14dp"

                android:textAppearance="@style/TextAppearance.Small"

                android:textColor="?android:attr/textColorSecondary"/>

                android:textAppearance="?android:attr/textAppearanceSmall"/>

        </LinearLayout>

    </LinearLayout>

</LinearLayout>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -7797,6 +7797,12 @@ 
    <!-- Checkbox text, when checked dialog will not show again [CHAR LIMIT=80] -->

    <string name="support_disclaimer_do_not_show">Do not show again</string>









    <!-- Prefix text for the account picker, e.g. "Requesting as user@gmail.com" [CHAR LIMIT=60] -->









    <string name="support_account_request_prefix">Requesting as</string>

















    <!-- Spinner dropdown text, when selected will try to add account [CHAR LIMIT=60] -->









    <string name="support_account_picker_add_account">Add account</string>

















    <!-- [CHAR LIMIT=60] Title of work profile setting page -->









    <string name="managed_profile_settings_title">Work profile settings</string>









    <!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->

























src/com/android/settings/dashboard/SupportFragment.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -138,8 +138,8 @@ public final class SupportFragment extends InstrumentedFragment implements View.







    @Override









    public void onAccountsUpdated(Account[] accounts) {









        // Account changed, update support items.









        mSupportItemAdapter.setAccount(









                mSupportFeatureProvider.getSupportEligibleAccount(mActivity));









        mSupportItemAdapter.setAccounts(









                mSupportFeatureProvider.getSupportEligibleAccounts(mActivity));









    }



















    @Override
































src/com/android/settings/dashboard/SupportItemAdapter.java



+74
−14






























Original line number
Diff line number
Diff line







@@ -26,6 +26,7 @@ import android.content.Context;







import android.content.Intent;









import android.content.pm.PackageManager;









import android.os.Bundle;









import android.support.annotation.VisibleForTesting;









import android.support.v7.widget.RecyclerView;









import android.text.TextUtils;









import android.view.LayoutInflater;








@@ -38,6 +39,7 @@ import android.widget.Spinner;







import android.widget.TextView;



















import com.android.internal.logging.nano.MetricsProto;









import com.android.internal.util.ArrayUtils;









import com.android.settings.R;









import com.android.settings.core.instrumentation.MetricsFeatureProvider;









import com.android.settings.overlay.SupportFeatureProvider;








@@ -46,8 +48,8 @@ import com.android.settings.support.SupportPhone;







import com.android.settings.support.SupportPhoneDialogFragment;



















import java.util.ArrayList;









import java.util.Arrays;









import java.util.List;









import java.util.Objects;



















import static com.android.settings.overlay.SupportFeatureProvider.SupportType.CHAT;









import static com.android.settings.overlay.SupportFeatureProvider.SupportType.PHONE;








@@ -58,6 +60,7 @@ import static com.android.settings.overlay.SupportFeatureProvider.SupportType.PH







public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAdapter.ViewHolder> {



















    private static final String STATE_SELECTED_COUNTRY = "STATE_SELECTED_COUNTRY";









    private static final String ACCOUNT_SELECTED_INDEX = "ACCOUNT_SELECTED_INDEX";









    private static final int TYPE_ESCALATION_OPTIONS = R.layout.support_escalation_options;









    private static final int TYPE_ESCALATION_OPTIONS_OFFLINE =









            R.layout.support_offline_escalation_options;








@@ -67,7 +70,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd

















    private final Activity mActivity;









    private final EscalationClickListener mEscalationClickListener;









    private final SpinnerItemSelectListener mSpinnerItemSelectListener;









    private final OfflineSpinnerItemSelectListener mOfflineSpinnerItemSelectListener;









    private final OnlineSpinnerItemSelectListener mOnlineSpinnerItemSelectListener;









    private final SupportFeatureProvider mSupportFeatureProvider;









    private final MetricsFeatureProvider mMetricsFeatureProvider;









    private final View.OnClickListener mItemClickListener;








@@ -75,7 +79,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd

















    private String mSelectedCountry;









    private boolean mHasInternet;









    private Account mAccount;









    private Account[] mAccounts;









    private int mSelectedAccountIndex;



















    public SupportItemAdapter(Activity activity, Bundle savedInstanceState,









            SupportFeatureProvider supportFeatureProvider,








@@ -86,16 +91,20 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







        mMetricsFeatureProvider = metricsFeatureProvider;









        mItemClickListener = itemClickListener;









        mEscalationClickListener = new EscalationClickListener();









        mSpinnerItemSelectListener = new SpinnerItemSelectListener();









        mOfflineSpinnerItemSelectListener = new OfflineSpinnerItemSelectListener();









        mOnlineSpinnerItemSelectListener = new OnlineSpinnerItemSelectListener();









        mSupportData = new ArrayList<>();









        // Optimistically assume we have Internet access. It will be updated later to correct value.









        mHasInternet = true;









        if (savedInstanceState != null) {









            mSelectedCountry = savedInstanceState.getString(STATE_SELECTED_COUNTRY);









            mSelectedAccountIndex = savedInstanceState.getInt(ACCOUNT_SELECTED_INDEX);









        } else {









            mSelectedCountry = mSupportFeatureProvider.getCurrentCountryCodeIfHasConfig(PHONE);









            mSelectedAccountIndex = 0;









        }









        mAccount = mSupportFeatureProvider.getSupportEligibleAccount(mActivity);



















        mAccounts = mSupportFeatureProvider.getSupportEligibleAccounts(mActivity);









        refreshData();









    }


















@@ -159,9 +168,11 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







        }









    }



















    public void setAccount(Account account) {









        if (!Objects.equals(mAccount, account)) {









            mAccount = account;









    public void setAccounts(Account accounts[]) {









        if (!Arrays.equals(mAccounts, accounts)) {









            int index = ArrayUtils.indexOf(accounts, mAccounts[mSelectedAccountIndex]);









            mSelectedAccountIndex = index != -1 ? index : 0;









            mAccounts = accounts;









            mSupportFeatureProvider.refreshOperationRules();









            refreshEscalationCards();









        }








@@ -169,6 +180,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd

















    public void onSaveInstanceState(Bundle outState) {









        outState.putString(STATE_SELECTED_COUNTRY, mSelectedCountry);









        outState.putInt(ACCOUNT_SELECTED_INDEX, mSelectedAccountIndex);









    }



















    /**








@@ -187,7 +199,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







     * different content.









     */









    private void addEscalationCards() {









        if (mAccount == null) {









        if (mAccounts.length == 0) {









            addSignInPromo();









        } else if (mHasInternet) {









            addOnlineEscalationCards();








@@ -341,6 +353,21 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







            holder.summary2View.setVisibility(mHasInternet && !TextUtils.isEmpty(data.summary2)









                    ? View.VISIBLE : View.GONE);









        }



















        bindAccountPicker(holder);









    }



















    @VisibleForTesting









    public void bindAccountPicker(ViewHolder holder) {









        final Spinner spinner = (Spinner) holder.itemView.findViewById(R.id.account_spinner);



















        final ArrayAdapter<String> adapter = new ArrayAdapter(









                mActivity, R.layout.support_account_spinner_item,









                extractAccountNames(mAccounts));









        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);









        spinner.setAdapter(adapter);









        spinner.setOnItemSelectedListener(mOnlineSpinnerItemSelectListener);









        spinner.setSelection(mSelectedAccountIndex);









    }



















    private void bindOfflineEscalationOptions(ViewHolder holder, OfflineEscalationData data) {








@@ -360,7 +387,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







                break;









            }









        }









        spinner.setOnItemSelectedListener(mSpinnerItemSelectListener);









        spinner.setOnItemSelectedListener(mOfflineSpinnerItemSelectListener);









        // Bind buttons









        if (data.tollFreePhone != null) {









            holder.text1View.setText(data.tollFreePhone.number);








@@ -415,11 +442,23 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







     */









    private void tryStartDisclaimerAndSupport(final @SupportFeatureProvider.SupportType int type) {









        if (mSupportFeatureProvider.shouldShowDisclaimerDialog(mActivity)) {









            DialogFragment fragment = SupportDisclaimerDialogFragment.newInstance(mAccount, type);









            DialogFragment fragment = SupportDisclaimerDialogFragment.newInstance(









                    mAccounts[mSelectedAccountIndex], type);









            fragment.show(mActivity.getFragmentManager(), SupportDisclaimerDialogFragment.TAG);









            return;









        }









        mSupportFeatureProvider.startSupport(mActivity, mAccount, type);









        mSupportFeatureProvider.startSupport(mActivity, mAccounts[mSelectedAccountIndex], type);









    }



















    private String[] extractAccountNames(Account[] accounts) {









        String[] accountNames = new String[accounts.length+1];









        for (int i = 0; i < accounts.length; i++) {









            accountNames[i] = accounts[i].name;









        }









        accountNames[accounts.length] = mActivity.getString(









                R.string.support_account_picker_add_account);



















        return accountNames;









    }



















    /**








@@ -428,7 +467,7 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







    private final class EscalationClickListener implements View.OnClickListener {









        @Override









        public void onClick(final View v) {









            if (mAccount == null) {









            if (mAccounts.length == 0) {









                switch (v.getId()) {









                    case android.R.id.text1:









                        mMetricsFeatureProvider.action(mActivity,








@@ -490,7 +529,8 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







        }









    }



















    private final class SpinnerItemSelectListener implements AdapterView.OnItemSelectedListener {









    private final class OfflineSpinnerItemSelectListener









            implements AdapterView.OnItemSelectedListener {



















        @Override









        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {








@@ -508,6 +548,26 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd







        }









    }



















    private final class OnlineSpinnerItemSelectListener









            implements AdapterView.OnItemSelectedListener {



















        @Override









        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {









            if (position == mAccounts.length) {









                mActivity.startActivity(mSupportFeatureProvider.getAccountLoginIntent());









                // Make sure "Add account" is not shown as selected item









                parent.setSelection(mSelectedAccountIndex);









            } else if (position != mSelectedAccountIndex) {









                mSelectedAccountIndex = position;









            }









        }



















        @Override









        public void onNothingSelected(AdapterView<?> parent) {









            // Do nothing.









        }









    }



















    /**









     * {@link RecyclerView.ViewHolder} for support items.









     */