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

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

Merge "Change contentDescription on Toolbar collapse button"

parents 20c326c3 181b9a26

res/layout-sw720dp/directory_app_bar.xml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
        android:theme="?actionBarTheme"

        android:popupTheme="?actionBarPopupTheme"

        android:elevation="3dp"

        app:collapseContentDescription="@string/button_back"

        app:titleTextAppearance="@style/ToolbarTitle"

        app:layout_collapseMode="pin">

res/layout/directory_app_bar.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
            android:theme="?actionBarTheme"

            android:popupTheme="?actionBarPopupTheme"

            android:elevation="3dp"

            app:collapseContentDescription="@string/button_back"

            app:titleTextAppearance="@style/ToolbarTitle"

            app:layout_collapseMode="pin">

res/layout/fixed_layout.xml

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
            android:elevation="3dp"

            android:theme="?actionBarTheme"

            android:popupTheme="?actionBarPopupTheme"

            app:collapseContentDescription="@string/button_back"

            app:titleTextAppearance="@style/ToolbarTitle">



            <TextView

res/layout/fragment_search.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
        android:layout_margin="@dimen/search_bar_margin"

        android:theme="?actionBarTheme"

        app:navigationIcon="@drawable/ic_arrow_back"

        app:navigationContentDescription="@string/abc_toolbar_collapse_description">

        app:navigationContentDescription="@string/button_back">



        <androidx.appcompat.widget.SearchView

            android:id="@+id/search_view"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
    <!-- Button label that show in the providers service. Many providers have their own app such

     as google drive. Pressing this button would open in the file in the providers app. -->

    <string name="button_show_provider">Show in provider</string>

    <!-- Button label that do back action [CHAR LIMIT=24] -->

    <string name="button_back">Back</string>



    <!-- A string used to show user that currently documents are not sorted in any given order. [CHAR_LIMIT=30] -->

    <string name="not_sorted">Not sorted</string>