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

Commit d82d80c3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6333744 from 9d57eb5a to rvc-release 

Change-Id: Idf62704f7ceb3157befe7659407e7427e6496efb
parents 625049c3 9d57eb5a

res/layout/item_root_header.xml

+11 −5
Original line number Diff line number Diff line
@@ -14,14 +14,20 @@ 
     limitations under the License.

-->



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

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingTop="12dp">

    android:paddingTop="8dp"

    android:paddingBottom="8dp"

    android:gravity="center_vertical">



    <TextView

        android:id="@android:id/title"

        android:textColor="?android:attr/textColorTertiary"

        style="?android:attr/listSeparatorTextViewStyle" />

        android:paddingStart="64dp"

        android:layout_width="wrap_content"

        android:layout_height="44dp"

        android:gravity="center_vertical"

        style="@style/DrawerMenuHeader"/>



</FrameLayout>
 
</LinearLayout>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -526,10 +526,10 @@ 
    <!-- Content description for deleting search history. [CHAR_LIMIT=60] -->

    <string name="delete_search_history">Delete search history <xliff:g id="text" example="image">%1$s</xliff:g></string>



    <!-- Label of tab to indicate personal directory [CHAR LIMIT=40] -->

    <!-- Label in tab and sidebar to indicate personal content [CHAR LIMIT=40] -->

    <string name="personal_tab">Personal</string>



    <!-- Label of tab to indicate work directory [CHAR LIMIT=40] -->

    <!-- Label in tab and sidebar tab to indicate work content [CHAR LIMIT=40] -->

    <string name="work_tab">Work</string>



    <!-- Accessibility label to indicate the subject(e.g. file/folder) is from work profile -->

res/values/styles_text.xml

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ 
        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textAllCaps">true</item>

        <item name="android:textSize">11sp</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

    </style>



    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">@color/item_root_primary_text</item>

src/com/android/documentsui/BaseActivity.java

+3 −5
Original line number Diff line number Diff line
@@ -213,6 +213,9 @@ public abstract class BaseActivity 
                    Metrics.logUserAction(MetricConsts.USER_ACTION_SEARCH_CHIP);

                    Metrics.logSearchType(item.getChipType());

                }

                // We also need to update AppsRowManager because we may want to show/hide the

                // appsRow in cross-profile search according to the searching conditions.

                mAppsRowManager.updateView(BaseActivity.this);

            }



            @Override
@@ -791,11 +794,6 @@ public abstract class BaseActivity 
        return mSearchManager.isExpanded();

    }



    @Override

    public boolean isTextSearching() {

        return mSearchManager.isTextSearching();

    }



    @Override

    public UserId getSelectedUser() {

        return mNavigator.getSelectedUser();

src/com/android/documentsui/NavigationViewManager.java

+0 −1
Original line number Diff line number Diff line
@@ -234,6 +234,5 @@ public class NavigationViewManager { 
        @Deprecated  // Use CommonAddones#refreshCurrentRootAndDirectory

        void refreshCurrentRootAndDirectory(int animation);

        boolean isSearchExpanded();

        boolean isTextSearching();

    }

}