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

Commit beadef46 authored by Bill Rassieur's avatar Bill Rassieur
Browse files

Merge master@5406228 into git_qt-dev-plus-aosp. 

Change-Id: I1cb194216b664add8b145ffe5bc0b6f56ec8c523
BUG: 129345239
parents 62d47764 558cdbd2

res/layout/fragment_pick.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


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

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

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

        style="?attr/materialButtonOutlinedStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="4dp"
@@ -34,7 +34,7 @@ 


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

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

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

        style="?attr/materialButtonStyle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginStart="4dp"

res/layout/item_doc_header_message.xml

+31 −39
Original line number Diff line number Diff line
@@ -13,45 +13,37 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    android:animateLayoutChanges="true"

    android:id="@+id/message_container"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:orientation="horizontal"

    android:id="@+id/message_container"

    android:paddingLeft="@dimen/header_message_horizontal_padding"

    android:paddingRight="@dimen/header_message_horizontal_padding">



        <FrameLayout

            android:layout_height="@dimen/icon_size"

            android:layout_width="@dimen/icon_size"

            android:layout_gravity="center_vertical"

            >

    android:minHeight="?android:attr/listPreferredItemHeightSmall">



    <ImageView

        android:contentDescription="@null"

        android:id="@+id/message_icon"

                android:layout_height="match_parent"

                android:layout_width="wrap_content"

        android:layout_height="@dimen/icon_size"

        android:layout_width="@dimen/icon_size"

        android:layout_marginStart="@dimen/list_item_padding"

        android:layout_marginEnd="@dimen/list_item_padding"

        android:scaleType="centerInside"/>



        </FrameLayout>



    <TextView

        android:id="@+id/message_textview"

            android:layout_gravity="center_vertical"

        android:layout_height="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

        android:layout_width="wrap_content"

        android:layout_marginStart="0dp"

        android:layout_marginEnd="@dimen/list_item_padding"

        android:layout_toEndOf="@+id/message_icon"

        android:selectAllOnFocus="true"/>



    <Button

        android:id="@+id/button_dismiss"

            android:layout_gravity="end"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:layout_alignEnd="@+id/message_textview"

        android:layout_below="@+id/message_textview"

        android:text="@android:string/ok"

            style="?attr/materialButton"/>



</LinearLayout>
 
        style="?attr/materialButtonStyle"/>

</RelativeLayout>

res/values-ar/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -331,7 +331,8 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"تصفّح الملفات في تطبيقات أخرى"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"مجهول"</string>

    <string name="open_tree_button" msgid="19992834788135845">"السماح بالوصول إلى \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\""</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"هل ترغب في السماح بالوصول إلى \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" على \"<xliff:g id="ROOT">%2$s</xliff:g>\"؟"</string>

    <!-- no translation found for open_tree_dialog_title (8429465292253532274) -->

    <skip />

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"يؤدي ذلك إلى السماح لتطبيق \"<xliff:g id="APPNAME">%1$s</xliff:g>\" بالحصول على إمكانية الدخول الكاملة إلى جميع الملفات المخزَّنة حاليًا ضِمنَ هذا الموقع وإلى أيّ محتوى يُخزَّن هنا في المستقبل."</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"البحث في هذا الهاتف"</string>

</resources>

res/values-ca/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"Cerca fitxers en altres aplicacions"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"Anònima"</string>

    <string name="open_tree_button" msgid="19992834788135845">"Permet l\'accés a \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\""</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"Vols permetre l\'accés al directori \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" de \"<xliff:g id="ROOT">%2$s</xliff:g>\"?"</string>

    <!-- no translation found for open_tree_dialog_title (8429465292253532274) -->

    <skip />

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"Permetrà que <xliff:g id="APPNAME">%1$s</xliff:g> accedeixi a tots els fitxers que hi ha emmagatzemats actualment en aquesta ubicació i a qualsevol contingut que s\'hi emmagatzemi posteriorment."</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"Cerca en aquest telèfon"</string>

</resources>

res/values-de/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ 
    <string name="apps_row_title" msgid="3340490016663092925">"Dateien in anderen Apps ansehen"</string>

    <string name="anonymous_application" msgid="7633027057951625862">"Anonym"</string>

    <string name="open_tree_button" msgid="19992834788135845">"Zugriff auf \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" erlauben"</string>

    <string name="open_tree_dialog_title" msgid="6978383241897450134">"Zugriff auf \"<xliff:g id="DIRECTORY">%1$s</xliff:g>\" in \"<xliff:g id="ROOT">%2$s</xliff:g>\" erlauben?"</string>

    <!-- no translation found for open_tree_dialog_title (8429465292253532274) -->

    <skip />

    <string name="open_tree_dialog_message" msgid="8545093618524340168">"<xliff:g id="APPNAME">%1$s</xliff:g> hat dann uneingeschränkten Zugriff auf alle Dateien, die aktuell an diesem Ort gespeichert sind, sowie auf sämtliche Inhalte, die zukünftig dort gespeichert werden."</string>

    <string name="search_bar_hint" msgid="4517366509897977321">"Auf diesem Smartphone suchen"</string>

</resources>