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

Commit 19cb7ef5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "AOSP/Contacts - Update language to comply with Android's inclusive language guidance."

parents e8967e6a 362f422b

res/layout-land/contact_editor_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


        <include layout="@layout/photo_editor_view" />



        <!-- Dummy view so the first input field is not initially focused. b/21644158 -->

        <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->

        <View

            android:layout_width="0dp"

            android:layout_height="0dp"

res/layout/contact_editor_fragment.xml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


            <include layout="@layout/photo_editor_view" />



            <!-- Dummy view so the first input field is not initially focused. b/21644158 -->

            <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->

            <View

                android:layout_width="0dp"

                android:layout_height="0dp"

res/layout/menu_item_action_view.xml

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
  limitations under the License.

  -->



<!-- A dummy action view to attach extra hidden content description to menuItem for Talkback. -->

<!-- A placeholder action view to attach extra hidden content description to

     menuItem for Talkback. -->

<LinearLayout

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

    android:layout_width="match_parent"

src/com/android/contacts/CallUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class CallUtil { 


    /**

     * Return an Intent for making a phone call. A given Uri will be used as is (without any

     * sanity check).

     * quick check).

     */

    public static Intent getCallIntent(Uri uri) {

        return new Intent(Intent.ACTION_CALL, uri);

src/com/android/contacts/ContactPhotoManager.java

+2 −2
Original line number Diff line number Diff line
@@ -602,8 +602,8 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback { 
    private static final String[] COLUMNS = new String[] { Photo._ID, Photo.PHOTO };



    /**

     * Dummy object used to indicate that a bitmap for a given key could not be stored in the

     * cache.

     * Placeholder object used to indicate that a bitmap for a given key could not

     * be stored in the cache.

     */

    private static final BitmapHolder BITMAP_UNAVAILABLE;