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

Commit 1f8811c1 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Migrate away from temporary androidx.design_design target. 

androidx.design_design was a target created temporarily while
the com.google.android.material_material was being added.
This migrated to the final material design class packages.

Exempt-From-Owner-Approval: Large scale refactor
Test: make -j Contacts
Change-Id: I143a201fd56c331cf0f13ffc9c23b2e59107ad1c
parent 0e207294

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) 
LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))



LOCAL_STATIC_ANDROID_LIBRARIES := \

    androidx.design_design \

    com.google.android.material_material \

    androidx.transition_transition \

    androidx.legacy_legacy-support-v13 \

    androidx.appcompat_appcompat \

res/layout/group_name_edit_dialog.xml

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

-->



<android.support.design.widget.TextInputLayout

<com.google.android.material.textfield.TextInputLayout

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

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

    android:id="@+id/text_input_layout"
@@ -30,7 +30,7 @@ 
    <!-- In Android P there is no initial focus by default in touch mode. See b/77244371 -->

    <requestFocus />



    <android.support.design.widget.TextInputEditText

    <com.google.android.material.textfield.TextInputEditText

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -42,4 +42,4 @@ 
        android:minHeight="@dimen/dialog_edit_text_min_height"

        android:textAlignment="viewStart"

        android:singleLine="true"/>

</android.support.design.widget.TextInputLayout>
 
</com.google.android.material.textfield.TextInputLayout>

src/com/android/contacts/SimImportFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.content.Loader; 
import android.os.Bundle;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import android.support.design.widget.Snackbar;

import com.google.android.material.snackbar.Snackbar;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.collection.ArrayMap;

import androidx.core.view.ViewCompat;

src/com/android/contacts/activities/PeopleActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import android.provider.ContactsContract.Intents; 
import android.provider.ContactsContract.ProviderStatus;

import androidx.annotation.LayoutRes;

import androidx.coordinatorlayout.widget.CoordinatorLayout;

import android.support.design.widget.Snackbar;

import com.google.android.material.snackbar.Snackbar;

import androidx.core.content.ContextCompat;

import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.core.view.GravityCompat;

src/com/android/contacts/group/GroupNameEditDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.content.Loader; 
import android.database.Cursor;

import android.os.Bundle;

import android.provider.ContactsContract.Groups;

import android.support.design.widget.TextInputLayout;

import com.google.android.material.textfield.TextInputLayout;

import androidx.appcompat.app.AlertDialog;

import android.text.Editable;

import android.text.TextUtils;