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
This commit is contained in:
Aaron Heuckroth
2019-03-07 15:57:44 -05:00
parent 57d60d2c4e
commit 18bef2a353
3 changed files with 64 additions and 1 deletions

View File

@@ -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"
/>

View File

@@ -0,0 +1,27 @@
<?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>

View File

@@ -0,0 +1,36 @@
<?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>