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

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

Merge "Move display mode switch icon to sub header"

parents 81a8b5f1 adce72b8

res/layout/apps_item.xml

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

    android:layout_weight="1"

    android:minWidth="@dimen/apps_row_item_width"

    android:minHeight="@dimen/apps_row_item_height"

    android:paddingBottom="@dimen/apps_row_exit_icon_margin_bottom"

    android:orientation="vertical"

    android:background="@drawable/generic_ripple_background"

    android:gravity="center_horizontal">
@@ -53,7 +53,6 @@ 
        android:layout_width="@dimen/apps_row_exit_icon_size"

        android:layout_height="@dimen/apps_row_exit_icon_size"

        android:layout_marginTop="@dimen/apps_row_exit_icon_margin_top"

        android:layout_marginBottom="@dimen/apps_row_exit_icon_margin_bottom"

        android:scaleType="centerInside"

        android:src="@drawable/ic_exit_to_app"

        android:tint="@color/item_action_icon"/>

res/layout/directory_header.xml

+25 −10
Original line number Diff line number Diff line
@@ -27,17 +27,32 @@ 
    <!-- used for apps row. -->

    <include layout="@layout/apps_row"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginStart="@dimen/root_info_header_horizontal_padding"

        android:layout_marginEnd="@dimen/root_info_header_horizontal_padding"

        android:minHeight="@dimen/root_info_header_height">



        <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:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:textAppearance="@style/SortTitle"

            android:textAllCaps="true"

            android:maxLines="1"

            android:ellipsize="end"

        android:gravity="center"/>

            android:gravity="start|center_vertical"/>



        <androidx.appcompat.widget.ActionMenuView

            android:id="@+id/sub_menu"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

            android:theme="@style/SubMenuStyle"/>



    </LinearLayout>



    <!-- column headers are empty on small screens, in portrait or in grid mode. -->

    <include layout="@layout/column_headers"/>

res/menu/activity.xml

+0 −10
Original line number Diff line number Diff line
@@ -41,16 +41,6 @@ 
            android:icon="@drawable/ic_debug_menu"

            android:visible="false"

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_grid"

            android:title="@string/menu_grid"

            android:icon="@drawable/ic_menu_view_grid"

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_list"

            android:title="@string/menu_list"

            android:icon="@drawable/ic_menu_view_list"

            app:showAsAction="always"/>

        <item

            android:id="@+id/option_menu_new_window"

            android:title="@string/menu_new_window"

res/menu/sub_menu.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 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.

-->



<menu

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

    xmlns:app="http://schemas.android.com/apk/res-auto">



    <item

        android:id="@+id/sub_menu_grid"

        android:title="@string/menu_grid"

        android:icon="@drawable/ic_menu_view_grid"

        app:showAsAction="always"/>

    <item

        android:id="@+id/sub_menu_list"

        android:title="@string/menu_list"

        android:icon="@drawable/ic_menu_view_list"

        app:showAsAction="always"/>

</menu>
 
 No newline at end of file

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -81,4 +81,8 @@ 
    <style name="BottomSheet" parent="@style/Widget.Design.BottomSheet.Modal">

        <item name="android:background">@drawable/bottom_sheet_dialog_background</item>

    </style>



    <style name="SubMenuStyle">

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

    </style>

</resources>