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

Commit eda5d555 authored by Jan Altensen's avatar Jan Altensen
Browse files

Merge branch '181-q-fix_padding' into 'v1-q'

avicii: overlay: Improve padding

See merge request !5
parents 87e7451f b1a3ce36
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -707,10 +707,6 @@
         -->
         -->
    <string name="config_mainBuiltInDisplayCutout">M-436.5,33L-319.5,33A38.5,38.5 0,0 1,-281 71.5L-281,71.5A38.5,38.5 0,0 1,-319.5 110L-436.5,110A38.5,38.5 0,0 1,-475 71.5L-475,71.5A38.5,38.5 0,0 1,-436.5 33z M -475,0 L -283,0 Z M -540,0 L -540,113 Z</string>
    <string name="config_mainBuiltInDisplayCutout">M-436.5,33L-319.5,33A38.5,38.5 0,0 1,-281 71.5L-281,71.5A38.5,38.5 0,0 1,-319.5 110L-436.5,110A38.5,38.5 0,0 1,-475 71.5L-475,71.5A38.5,38.5 0,0 1,-436.5 33z M -475,0 L -283,0 Z M -540,0 L -540,113 Z</string>


    <!-- Height of the status bar -->
    <dimen name="status_bar_height_portrait">125px</dimen>
    <dimen name="status_bar_height_landscape">130px</dimen>

    <!-- The default peak refresh rate for a given device. -->
    <!-- The default peak refresh rate for a given device. -->
    <integer name="config_defaultPeakRefreshRate">90</integer>
    <integer name="config_defaultPeakRefreshRate">90</integer>


+31 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/common/assets/res/any/dimens.xml
**
** Copyright 2006, 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>
    <!-- Height of the status bar in portrait. The height should be
         Max((status bar content height + waterfall top size), top cutout size) -->
    <dimen name="status_bar_height_portrait">117px</dimen>

    <!-- Height of the status bar in landscape. The height should be
         Max((status bar content height + waterfall top size), top cutout size) -->
    <dimen name="status_bar_height_landscape">113px</dimen>

    <!-- Default radius of the software rounded corners. -->
    <dimen name="rounded_corner_radius">8dp</dimen>
</resources>
+45 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
 * Copyright (c) 2006, 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>
    <!--  Allow CornerHandleView and PathSpecCornerPathRenderer to decouple from corner-radius -->
    <dimen name="config_rounded_mask_size">190px</dimen>

    <!-- the padding on the start of the statusbar -->
    <dimen name="status_bar_padding_start">48px</dimen>

    <!-- the padding on the end of the statusbar -->
    <dimen name="status_bar_padding_end">55px</dimen>

    <!-- the padding on the top of the statusbar (usually 0) -->
    <dimen name="status_bar_padding_top">27px</dimen>

    <!-- Height of the status bar header bar when on Keyguard -->
    <dimen name="status_bar_header_height_keyguard">117px</dimen>

    <!-- Margin on the left side of the carrier text on Keyguard -->
    <dimen name="keyguard_carrier_text_margin">58px</dimen>

    <!-- Margin on the right side of the system icon group on Keyguard. -->
    <dimen name="system_icons_keyguard_padding_end">10px</dimen>

    <!-- The absolute side margins of quick settings -->
    <dimen name="rounded_corner_content_padding">30px</dimen>

    <!-- The indication margin of keyguard -->
    <dimen name="keyguard_indication_margin_bottom">15dp</dimen>
</resources>