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

Commit 9a8bcf5f authored by Aaron Heuckroth's avatar Aaron Heuckroth Committed by Android (Google) Code Review
Browse files

Merge "Add support for small screens to grid-based global actions menu."

parents e44c1193 4ea2fdb9

packages/SystemUI/res/layout-land/global_actions_grid.xml

+10 −9
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
            android:layoutDirection="ltr"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            android:paddingLeft="@dimen/global_actions_grid_top_padding"

            android:paddingRight="@dimen/global_actions_grid_bottom_padding"

            android:paddingTop="@dimen/global_actions_grid_left_padding"

            android:paddingBottom="@dimen/global_actions_grid_right_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:background="?android:attr/colorBackgroundFloating"

        >

            <LinearLayout
@@ -61,17 +61,18 @@ 
        <!-- For separated items-->

        <LinearLayout

            android:id="@+id/separated_button"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:paddingTop="@dimen/global_actions_grid_left_padding"

            android:paddingLeft="@dimen/global_actions_grid_top_padding"

            android:paddingBottom="@dimen/global_actions_grid_right_padding"

            android:paddingRight="@dimen/global_actions_grid_bottom_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:orientation="horizontal"

            android:layoutDirection="ltr"

            android:background="?android:attr/colorBackgroundFloating"

            android:gravity="center"

            android:translationZ="@dimen/global_actions_translate"

        />

packages/SystemUI/res/layout-land/global_actions_grid_seascape.xml

+11 −10
Original line number Diff line number Diff line
@@ -23,17 +23,18 @@ 
        <LinearLayout

            android:id="@+id/separated_button"

            android:layout_gravity="top|left"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:paddingTop="@dimen/global_actions_grid_left_padding"

            android:paddingLeft="@dimen/global_actions_grid_top_padding"

            android:paddingBottom="@dimen/global_actions_grid_right_padding"

            android:paddingRight="@dimen/global_actions_grid_bottom_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:orientation="horizontal"

            android:layoutDirection="rtl"

            android:background="?android:attr/colorBackgroundFloating"

            android:gravity="center"

            android:translationZ="@dimen/global_actions_translate"

        />
@@ -44,12 +45,12 @@ 
            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            android:paddingLeft="@dimen/global_actions_grid_top_padding"

            android:paddingRight="@dimen/global_actions_grid_bottom_padding"

            android:paddingTop="@dimen/global_actions_grid_left_padding"

            android:paddingBottom="@dimen/global_actions_grid_right_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:background="?android:attr/colorBackgroundFloating"

        >

            <LinearLayout

packages/SystemUI/res/layout/global_actions_grid.xml

+10 −9
Original line number Diff line number Diff line
@@ -23,15 +23,16 @@ 
        <LinearLayout

            android:id="@+id/separated_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginLeft="@dimen/global_actions_grid_side_margin"

            android:layout_marginRight="@dimen/global_actions_grid_side_margin"

            android:paddingTop="@dimen/global_actions_grid_top_padding"

            android:paddingLeft="@dimen/global_actions_grid_left_padding"

            android:paddingBottom="@dimen/global_actions_grid_bottom_padding"

            android:paddingRight="@dimen/global_actions_grid_right_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:orientation="vertical"

            android:background="?android:attr/colorBackgroundFloating"

            android:gravity="center"

            android:translationZ="@dimen/global_actions_translate"

        />
@@ -44,10 +45,10 @@ 
            android:layoutDirection="rtl"

            android:layout_marginRight="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            android:paddingLeft="@dimen/global_actions_grid_left_padding"

            android:paddingRight="@dimen/global_actions_grid_right_padding"

            android:paddingTop="@dimen/global_actions_grid_top_padding"

            android:paddingBottom="@dimen/global_actions_grid_bottom_padding"

            android:paddingLeft="@dimen/global_actions_grid_horizontal_padding"

            android:paddingRight="@dimen/global_actions_grid_horizontal_padding"

            android:paddingTop="@dimen/global_actions_grid_vertical_padding"

            android:paddingBottom="@dimen/global_actions_grid_vertical_padding"

            android:background="?android:attr/colorBackgroundFloating"

        >

            <LinearLayout

packages/SystemUI/res/layout/global_actions_grid_item.xml

+14 −17
Original line number Diff line number Diff line
@@ -18,46 +18,43 @@ 
     work around this for now with LinearLayouts. -->

<LinearLayout

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

    android:layout_width="72dp"

    android:layout_height="72dp"

    android:gravity="center"

    android:layout_width="@dimen/global_actions_grid_item_width"

    android:layout_height="@dimen/global_actions_grid_item_height"

    android:gravity="top|center_horizontal"

    android:orientation="vertical"

    android:layout_marginTop="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginBottom="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginLeft="@dimen/global_actions_grid_item_side_margin"

    android:layout_marginRight="@dimen/global_actions_grid_item_side_margin"

    android:paddingEnd="4dip"

    android:paddingStart="4dip">



>

    <ImageView

        android:id="@*android:id/icon"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_gravity="center"

        android:layout_width="@dimen/global_actions_grid_item_icon_width"

        android:layout_height="@dimen/global_actions_grid_item_icon_height"

        android:layout_marginTop="@dimen/global_actions_grid_item_icon_top_margin"

        android:layout_marginBottom="@dimen/global_actions_grid_item_icon_bottom_margin"

        android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin"

        android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin"

        android:scaleType="center"

        android:alpha="?android:attr/primaryContentAlpha"

    />



    <TextView

        android:id="@*android:id/message"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top|center_horizontal"

        android:paddingTop="10dp"

        android:gravity="center"

        android:textSize="12sp"

        android:textSize="12dp"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:singleLine="true"

    />



    <TextView

        android:visibility="gone"

        android:id="@*android:id/status"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="top|center_horizontal"

        android:gravity="center"

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

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:singleLine="true"

    />

</LinearLayout>

packages/SystemUI/res/values-sw320dp-land/dimens.xml

0 → 100644
+27 −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

  -->

<resources>



    <!-- Global actions grid -->

    <dimen name="global_actions_grid_vertical_padding">3dp</dimen>

    <dimen name="global_actions_grid_horizontal_padding">0dp</dimen>



    <dimen name="global_actions_grid_item_side_margin">4dp</dimen>

    <dimen name="global_actions_grid_item_vertical_margin">5dp</dimen>



</resources>