Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use default sizes for global actions." into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-03 18:42:31 +00:00
committed by Android (Google) Code Review
parent 0cb1ec4c4e 3bdfe8a065
commit e31d68bc3b
2 changed files with 16 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SystemUI/res/values-sw320dp/dimens.xml
View File

@@ -1,36 +0,0 @@
<?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">3dp</dimen>
<dimen name="global_actions_grid_item_side_margin">5dp</dimen>
<dimen name="global_actions_grid_item_vertical_margin">4dp</dimen>
<dimen name="global_actions_grid_item_width">64dp</dimen>
<dimen name="global_actions_grid_item_height">64dp</dimen>
<dimen name="global_actions_grid_item_icon_width">20dp</dimen>
<dimen name="global_actions_grid_item_icon_height">20dp</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>
<!-- Home Controls -->
<dimen name="global_actions_side_margin">10dp</dimen>
</resources>

17
packages/SystemUI/res/values/dimens.xml
View File

@@ -1032,8 +1032,23 @@
<dimen name="global_actions_grid_container_shadow_offset">20dp</dimen> <dimen name="global_actions_grid_container_shadow_offset">20dp</dimen>
<dimen name="global_actions_grid_container_negative_shadow_offset">-20dp</dimen> <dimen name="global_actions_grid_container_negative_shadow_offset">-20dp</dimen>
<!-- Global actions grid -->
<dimen name="global_actions_grid_vertical_padding">3dp</dimen>
<dimen name="global_actions_grid_horizontal_padding">3dp</dimen>
<dimen name="global_actions_grid_item_side_margin">5dp</dimen>
<dimen name="global_actions_grid_item_vertical_margin">4dp</dimen>
<dimen name="global_actions_grid_item_width">64dp</dimen>
<dimen name="global_actions_grid_item_height">64dp</dimen>
<dimen name="global_actions_grid_item_icon_width">20dp</dimen>
<dimen name="global_actions_grid_item_icon_height">20dp</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>
<!-- Margins at the left and right of the power menu and home controls widgets. --> <!-- Margins at the left and right of the power menu and home controls widgets. -->
<dimen name="global_actions_side_margin">16dp</dimen> <dimen name="global_actions_side_margin">10dp</dimen>
<!-- Amount to shift the layout when exiting/entering for controls activities --> <!-- Amount to shift the layout when exiting/entering for controls activities -->
<dimen name="global_actions_controls_y_translation">20dp</dimen> <dimen name="global_actions_controls_y_translation">20dp</dimen>