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

Commit 4ea95b7f authored by Thales Lima's avatar Thales Lima
Browse files

Revert "Making tablet grid scalable and tuning size" 

Revert "[automerge] Making tablet grid scalable and tuning size ..."

Revert submission 17607211-aosp_tablet_tune

Reason for revert: Breaking a test b/228490147
Reverted Changes:
I88e581231:[automerge] Making tablet grid scalable and tuning...
I078d19905:Making tablet grid scalable and tuning size
Original bug: b/227344807

Change-Id: Ie6e55edcf5b82b73ad2c8ed7ffd5f0fa5b53594a
parent c0481524

res/xml/device_profiles.xml

+5 −22
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ 
        launcher:numFolderColumns="3"

        launcher:numHotseatIcons="6"

        launcher:numAllAppsColumns="6"

        launcher:isScalable="true"

        launcher:devicePaddingId="@xml/paddings_6x5"

        launcher:dbFile="launcher_6_by_5.db"

        launcher:defaultLayoutId="@xml/default_workspace_6x5"

        launcher:deviceCategory="tablet" >
@@ -155,29 +153,14 @@ 
            launcher:name="Tablet"

            launcher:minWidthDps="900"

            launcher:minHeightDps="820"

            launcher:minCellHeight="120"

            launcher:minCellWidth="102"

            launcher:minCellHeightLandscape="104"

            launcher:minCellWidthLandscape="120"

            launcher:minCellHeight="104"

            launcher:minCellWidth="80"

            launcher:iconImageSize="60"

            launcher:iconTextSize="14"

            launcher:borderSpaceHorizontal="16"

            launcher:borderSpaceVertical="64"

            launcher:borderSpaceLandscapeHorizontal="64"

            launcher:borderSpaceLandscapeVertical="16"

            launcher:horizontalMargin="54"

            launcher:horizontalMarginLandscape="120"

            launcher:allAppsCellWidth="96"

            launcher:allAppsCellHeight="142"

            launcher:allAppsCellWidthLandscape="126"

            launcher:allAppsCellHeightLandscape="126"

            launcher:borderSpace="16"

            launcher:allAppsIconSize="60"

            launcher:allAppsIconTextSize="14"

            launcher:allAppsBorderSpaceHorizontal="8"

            launcher:allAppsBorderSpaceVertical="16"

            launcher:allAppsBorderSpaceLandscape="16"

            launcher:hotseatBorderSpace="58"

            launcher:hotseatBorderSpaceLandscape="50.4"

            launcher:allAppsBorderSpace="16"

            launcher:canBeDefault="true" />



    </grid-option>

res/xml/paddings_6x5.xml

deleted100644 → 0
+0 −76
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022 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.

  -->



<device-paddings xmlns:launcher="http://schemas.android.com/apk/res-auto" >



    <!--  Some non default screen sizes  -->

    <device-padding

        launcher:maxEmptySpace="30dp">

        <workspaceTopPadding

            launcher:a="0.34"

            launcher:b="0"/>

        <workspaceBottomPadding

            launcher:a="0.26"

            launcher:b="0"/>

        <hotseatBottomPadding

            launcher:a="0.4"

            launcher:b="0"/>

    </device-padding>



    <device-padding

        launcher:maxEmptySpace="80dp">

        <workspaceTopPadding

            launcher:a="0"

            launcher:b="20dp"/>

        <workspaceBottomPadding

            launcher:a="0.4"

            launcher:b="0"

            launcher:c="20dp"/>

        <hotseatBottomPadding

            launcher:a="0.6"

            launcher:b="0"

            launcher:c="20dp"/>

    </device-padding>



    <device-padding

        launcher:maxEmptySpace="280dp">

        <workspaceTopPadding

            launcher:a="0"

            launcher:b="112dp"/>

        <workspaceBottomPadding

            launcher:a="0.4"

            launcher:b="0"

            launcher:c="112dp"/>

        <hotseatBottomPadding

            launcher:a="0.6"

            launcher:b="0"

            launcher:c="112dp"/>

    </device-padding>



    <device-padding

        launcher:maxEmptySpace="9999dp">

        <workspaceTopPadding

            launcher:a="0.40"

            launcher:c="36dp"/>

        <workspaceBottomPadding

            launcher:a="0.60"

            launcher:c="36dp"/>

        <hotseatBottomPadding

            launcher:a="0"

            launcher:b="36dp"/>

    </device-padding>

</device-paddings>
 
 No newline at end of file