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

Commit 002e9290 authored by Tony Huang's avatar Tony Huang Committed by Android (Google) Code Review
Browse files

Merge "Use material design snackbar to replace deprecated snackbar"

parents ac9ace57 7e72a2db

build_apk.mk

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
        androidx.legacy_legacy-support-v4 \

        androidx.appcompat_appcompat \

        androidx.legacy_legacy-support-v13 \

        androidx.design_design \

        androidx.transition_transition \

        androidx.recyclerview_recyclerview \

        androidx.recyclerview_recyclerview-selection \

res/layout/dialog_file_name.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:layout_height="wrap_content"

    android:fitsSystemWindows="true"

    android:padding="?android:attr/listPreferredItemPaddingEnd">

    <android.support.design.widget.TextInputLayout

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

        android:id="@+id/rename_input_wrapper"

        android:orientation="vertical"

        android:layout_width="match_parent"
@@ -30,5 +30,5 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:inputType="text"/>

    </android.support.design.widget.TextInputLayout>

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

</FrameLayout>

res/layout/fragment_pick.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:gravity="center_vertical|end"

    android:paddingEnd="@dimen/bottom_bar_padding_end">



    <android.support.design.button.MaterialButton

    <com.google.android.material.button.MaterialButton

        android:id="@android:id/button2"

        style="@style/Widget.MaterialComponents.Button.OutlinedButton"

        android:layout_width="wrap_content"
@@ -31,7 +31,7 @@ 
        android:layout_marginEnd="4dp"

        android:text="@android:string/cancel"/>



    <android.support.design.button.MaterialButton

    <com.google.android.material.button.MaterialButton

        android:id="@android:id/button1"

        style="@style/Widget.MaterialComponents.Button.UnelevatedButton"

        android:layout_width="wrap_content"

res/layout/fragment_save.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent">



        <android.support.design.button.MaterialButton

        <com.google.android.material.button.MaterialButton

            android:id="@android:id/button1"

            style="@style/Widget.MaterialComponents.Button.UnelevatedButton"

            android:layout_width="wrap_content"

res/values-night/themes.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
        <item name="actionBarTheme">@style/ActionBarTheme</item>

        <item name="actionBarPopupTheme">@style/ActionBarPopupTheme</item>

        <item name="actionModeStyle">@style/ActionModeStyle</item>

        <item name="snackbarButtonStyle">@style/SnackbarButtonStyle</item>



        <item name="android:windowBackground">@color/g_dark_grey</item>

        <item name="android:colorPrimaryDark">@color/g_grey</item>