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

Commit 0c5400ee authored by Aran Ink's avatar Aran Ink Committed by Android (Google) Code Review
Browse files

Merge "Tweak colors and spacing for GlobalActionsDialog." into qt-dev

parents 4ec18d46 622a43e2

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

+8 −8
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
            android:orientation="vertical"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            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:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

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

        >

            <LinearLayout
@@ -60,10 +60,10 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            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:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:orientation="horizontal"

            android:layoutDirection="ltr"

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

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

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

  -->



<!-- RelativeLayouts have an issue enforcing minimum heights, so just

     work around this for now with LinearLayouts. -->

<LinearLayout

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:layout_marginTop="@dimen/global_actions_grid_item_side_margin"

    android:layout_marginBottom="@dimen/global_actions_grid_item_side_margin"

    android:layout_marginLeft="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginRight="@dimen/global_actions_grid_item_vertical_margin"

>

    <LinearLayout

        android:layout_width="@dimen/global_actions_grid_item_height"

        android:layout_height="@dimen/global_actions_grid_item_width"

        android:gravity="top|center_horizontal"

        android:orientation="vertical"

    >

        <ImageView

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

            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="centerInside"

            android:tint="@color/global_actions_text"

        />



        <TextView

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:ellipsize="marquee"

            android:marqueeRepeatLimit="marquee_forever"

            android:singleLine="true"

            android:gravity="center"

            android:textSize="12dp"

            android:textColor="@color/global_actions_text"

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

        />



        <TextView

            android:visibility="gone"

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

            android:textColor="@color/global_actions_text"

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

        />

    </LinearLayout>

</LinearLayout>

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

+8 −8
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/global_actions_grid_side_margin"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            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:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

            android:orientation="horizontal"

            android:layoutDirection="rtl"

            android:background="?android:attr/colorBackgroundFloating"
@@ -49,10 +49,10 @@ 
            android:orientation="vertical"

            android:layout_marginBottom="@dimen/global_actions_grid_side_margin"

            android:translationZ="@dimen/global_actions_translate"

            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:paddingLeft="@dimen/global_actions_grid_vertical_padding"

            android:paddingRight="@dimen/global_actions_grid_vertical_padding"

            android:paddingTop="@dimen/global_actions_grid_horizontal_padding"

            android:paddingBottom="@dimen/global_actions_grid_horizontal_padding"

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

        >

            <LinearLayout

packages/SystemUI/res/layout/global_actions_grid_item.xml

+5 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
     work around this for now with LinearLayouts. -->

<LinearLayout

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

    android:layout_width="@dimen/global_actions_grid_item_width"

    android:layout_height="@dimen/global_actions_grid_item_height"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:layout_marginTop="@dimen/global_actions_grid_item_vertical_margin"

    android:layout_marginBottom="@dimen/global_actions_grid_item_vertical_margin"
@@ -41,7 +41,7 @@ 
            android:layout_marginLeft="@dimen/global_actions_grid_item_icon_side_margin"

            android:layout_marginRight="@dimen/global_actions_grid_item_icon_side_margin"

            android:scaleType="centerInside"

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

            android:tint="@color/global_actions_text"

        />



        <TextView
@@ -53,6 +53,7 @@ 
            android:singleLine="true"

            android:gravity="center"

            android:textSize="12dp"

            android:textColor="@color/global_actions_text"

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

        />
@@ -62,7 +63,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:gravity="center"

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

            android:textColor="@color/global_actions_text"

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

        />

    </LinearLayout>

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

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