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

Commit d604b53d authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "Remove dropdown sort bar and add root info header"

parents c19c2a75 d74f3703
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -21,8 +21,17 @@
    <!-- used for top padding. -->
    <include layout="@layout/action_bar_space"/>

    <!-- dropdown sort widget shows when column headers doesn't. -->
    <include layout="@layout/dropdown_sort_widget"/>
    <TextView
        android:id="@+id/header_title"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:minHeight="@dimen/root_info_header_height"
        android:paddingStart="@dimen/root_info_header_horizontal_padding"
        android:textAppearance="@style/SortTitle"
        android:textAllCaps="true"
        android:maxLines="1"
        android:ellipsize="end"
        android:gravity="center"/>

    <!-- column headers are empty on small screens, in portrait or in grid mode. -->
    <include layout="@layout/column_headers"/>
+0 −40
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
    Copyright (C) 2016 The Android Open Source Project

    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at

         http://www.apache.org/licenses/LICENSE-2.0

    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
  -->

<LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/dropdown_sort_widget"
    android:layout_width="match_parent"
    android:layout_height="@dimen/doc_header_height"
    android:paddingStart="@dimen/dropdown_sort_widget_margin"
    android:paddingEnd="@dimen/dropdown_sort_widget_margin"
    android:background="?android:attr/colorPrimary"
    android:gravity="center_vertical|start"
    android:orientation="horizontal">

    <TextView
        android:id="@+id/sort_dimen_dropdown"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:minHeight="@dimen/dropdown_sort_widget_size"
        android:paddingStart="12dp"
        android:gravity="center"
        android:textAllCaps="true"
        android:textAppearance="@style/SortTitle"
        style="?android:attr/borderlessButtonStyle"/>

</LinearLayout>
+2 −1
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@
        android:textAlignment="viewStart"
        android:drawablePadding="12dp"
        android:drawableRight="@drawable/ic_breadcrumb_arrow_down"
        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title"
        android:gravity="center_vertical"/>
</LinearLayout>
+3 −0
Original line number Diff line number Diff line
@@ -76,4 +76,7 @@
    <dimen name="bottom_bar_button_corner_radius">4dp</dimen>

    <dimen name="inspector_header_height">350dp</dimen>

    <dimen name="root_info_header_height">48dp</dimen>
    <dimen name="root_info_header_horizontal_padding">24dp</dimen>
</resources>
+13 −0
Original line number Diff line number Diff line
@@ -399,4 +399,17 @@
        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> selected</item>
        <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> selected</item>
    </plurals>

    <!-- Header title for list of documents in recent root. [CHAR_LIMIT=60] -->
    <string name="root_info_header_recent">Recent files on phone</string>
    <!-- Header title for list of documents in global searching. [CHAR_LIMIT=60] -->
    <string name="root_info_header_global_search">Files on phone</string>
    <!-- Header title for list of documents in media type root. [CHAR_LIMIT=60] -->
    <string name="root_info_header_media"><xliff:g id="label" example="images">%1$s</xliff:g> on phone</string>
    <!-- Header title for list of documents in storage type root. [CHAR_LIMIT=60] -->
    <string name="root_info_header_storage">Files on <xliff:g id="device" example="Pixel">%1$s</xliff:g></string>
    <!-- Header title for list of documents 3 party provider root eg. Drive, Box. [CHAR_LIMIT=60] -->
    <string name="root_info_header_app">Files from <xliff:g id="label" example="Drive">%1$s</xliff:g></string>
    <!-- Header title for list of documents 3 party provider root eg. Drive, Box. with root summary.[CHAR_LIMIT=60] -->
    <string name="root_info_header_app_with_summary">Files from <xliff:g id="label" example="Drive">%1$s</xliff:g> / <xliff:g id="summary" example="example@com">%2$s</xliff:g></string>
</resources>
Loading