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

Commit 89a8f840 authored by Marcus Hagerott's avatar Marcus Hagerott Committed by Android (Google) Code Review
Browse files

Merge changes Ie5886646,Id14651f0 into ub-contactsdialer-h-dev 

* changes:
  Improve talkback usability of SIM import dialog.
  Adjustments to MockContentProvider for tests.
parents ee5b3b9f da071fbb

res/layout/fragment_sim_import.xml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
        android:background="?attr/colorPrimary"

        android:elevation="4dp"

        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"

        app:navigationContentDescription="@string/sim_import_cancel_content_description"

        app:navigationIcon="@drawable/ic_close_dk"

        app:title="@string/sim_import_title_none_selected">

res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -1812,4 +1812,11 @@ 
    <!-- Toast shown on settings screen when importing from SIM completes with an error -->

    <string name="sim_import_failed_toast">Failed to import SIM contacts</string>



    <!-- Title of SIM import dialog for accessibility; this isn't displayed but is announced

     by talkback when the window is shown -->

    <string name="sim_import_dialog_title">Select contacts to import</string>



    <!-- Content description of the cancel navigation icon shown in SIM import dialog toolbar -->

    <string name="sim_import_cancel_content_description">Cancel import</string>



</resources>

src/com/android/contacts/SimImportFragment.java

+16 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.contacts;



import android.app.Dialog;

import android.app.DialogFragment;

import android.app.LoaderManager;

import android.content.AsyncTaskLoader;
@@ -74,7 +75,7 @@ public class SimImportFragment extends DialogFragment 
    @Override

    public void onCreate(final Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        setStyle(STYLE_NO_TITLE, R.style.PeopleThemeAppCompat_FullScreenDialog);

        setStyle(STYLE_NORMAL, R.style.PeopleThemeAppCompat_FullScreenDialog);

        mPreferences = new ContactsPreferences(getContext());

        mAccountTypeManager = AccountTypeManager.getInstance(getActivity());

        mAdapter = new SimContactAdapter(getActivity());
@@ -88,6 +89,15 @@ public class SimImportFragment extends DialogFragment 
                NO_SUBSCRIPTION_ID);

    }



    @Override

    public Dialog onCreateDialog(Bundle savedInstanceState) {

        Dialog dialog = super.onCreateDialog(savedInstanceState);

        // Set the title for accessibility. It isn't displayed but will get announced when the

        // window is shown

        dialog.setTitle(R.string.sim_import_dialog_title);

        return dialog;

    }



    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);
@@ -248,6 +258,11 @@ public class SimImportFragment extends DialogFragment 
            ContactListItemView contactView = (ContactListItemView) itemView;

            bindNameAndViewId(contactView, cursor);

            bindPhoto(contactView, partition, cursor);



            // For accessibility. Tapping the item checks this so we don't need it to be separately

            // clickable

            contactView.getCheckBox().setFocusable(false);

            contactView.getCheckBox().setClickable(false);

        }



        public void setContacts(ArrayList<SimContact> contacts) {

src/com/android/contacts/common/preference/ContactsPreferences.java

+1 −0
Original line number Diff line number Diff line
@@ -413,4 +413,5 @@ public class ContactsPreferences implements OnSharedPreferenceChangeListener { 
            }

        }

    }



}

tests/src/com/android/contacts/RunMethodInstrumentation.java

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class RunMethodInstrumentation extends Instrumentation { 
        start();

    }



    @Override

    public void onStart() {

        Log.d(TAG, "onStart");

        super.onStart();