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

Commit 18bef2a3 authored by Aaron Heuckroth's avatar Aaron Heuckroth
Browse files

Fix Global Actions icon scaling and grid sizing on blueline. 

Test: Automated tests pass, manual testing at different display sizes on blueline.
Change-Id: I9f89a11646689eb96fb2aa270783921130d54972
parent 57d60d2c

packages/SystemUI/res/layout/global_actions_grid_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
        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:scaleType="centerInside"

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

    />

packages/SystemUI/res/values-sw392dp-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">6dp</dimen>

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



</resources>

packages/SystemUI/res/values-sw392dp/dimens.xml

0 → 100644
+36 −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_container_bottom_margin">4dp</dimen>



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

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



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

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

    <dimen name="global_actions_grid_item_width">72dp</dimen>

    <dimen name="global_actions_grid_item_height">72dp</dimen>



    <dimen name="global_actions_grid_item_icon_width">22dp</dimen>

    <dimen name="global_actions_grid_item_icon_height">22dp</dimen>

    <dimen name="global_actions_grid_item_icon_top_margin">12dp</dimen>

    <dimen name="global_actions_grid_item_icon_side_margin">22dp</dimen>

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



</resources>