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

Commit e372366b authored by Pat Manning's avatar Pat Manning
Browse files

Revert "Adjust edit state drop targets, workspace scaling, and m..." 

Test: manual

Revert submission 17004675-edit-state

Reason for revert: b/226274309
Reverted Changes:
Ib50509b6f:Adjust edit state drop targets per device type and...
Id1817cd3c:Adjust edit state drop targets, workspace scaling,...

Change-Id: I22863d7735f49f6a040a17cf56cc66f20a3e0986
parent ee09cd03

res/drawable/drop_target_frame.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 
<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:shape="rectangle">

    <solid android:color="@android:color/transparent" />

    <corners android:radius="80dp" />

    <corners android:radius="28dp" />

    <stroke android:width="2dp" android:color="?attr/workspaceAccentColor" />

</shape>
 
 No newline at end of file

res/values-land/dimens.xml

+0 −14
Original line number Diff line number Diff line
@@ -22,22 +22,8 @@ 
    <dimen name="fastscroll_popup_text_size">24dp</dimen>



    <!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">15.28dp</dimen>

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

    <dimen name="dynamic_grid_drop_target_size">36dp</dimen>

    <dimen name="cell_layout_padding">20dp</dimen>



    <!-- Hotseat -->

    <dimen name="dynamic_grid_hotseat_side_padding">16dp</dimen>

    <dimen name="spring_loaded_hotseat_top_margin">45dp</dimen>



    <!-- Dragging -->

    <dimen name="drop_target_button_gap">28dp</dimen>

    <dimen name="drop_target_button_drawable_horizontal_padding">16dp</dimen>

    <dimen name="drop_target_button_drawable_vertical_padding">2dp</dimen>

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

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



    <!-- Workspace grid visualization parameters -->

    <dimen name="grid_visualization_horizontal_cell_spacing">24dp</dimen>

</resources>

res/values-sw600dp-land/dimens.xml

deleted100644 → 0
+0 −32
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.

  -->



<resources>

<!-- Hotseat -->

    <dimen name="spring_loaded_hotseat_top_margin">44dp</dimen>



<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">11.33dp</dimen>

    <dimen name="cell_layout_padding">11.33dp</dimen>



<!-- Dragging -->

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

    <dimen name="drop_target_bottom_margin">16dp</dimen>



<!-- AllApps -->

    <dimen name="all_apps_bottom_sheet_horizontal_padding">52dp</dimen>

</resources>

res/values-sw600dp/dimens.xml

+0 −14
Original line number Diff line number Diff line
@@ -32,22 +32,8 @@ 
    <dimen name="fastscroll_popup_text_size">32dp</dimen>



<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">9dp</dimen>

    <dimen name="dynamic_grid_icon_drawable_padding">7dp</dimen>

    <dimen name="cell_layout_padding">9dp</dimen>





<!-- Hotseat -->

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

    <dimen name="spring_loaded_hotseat_top_margin">97dp</dimen>



<!-- Dragging -->

    <dimen name="drop_target_top_margin">34dp</dimen>

    <dimen name="drop_target_bottom_margin">16dp</dimen>

    <dimen name="drop_target_button_drawable_horizontal_padding">16dp</dimen>

    <dimen name="drop_target_button_drawable_vertical_padding">16dp</dimen>

    <dimen name="dynamic_grid_drop_target_size">56dp</dimen>



<!-- Workspace grid visualization parameters -->

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

</resources>

res/values-sw720dp-land/dimens.xml

+2 −16
Original line number Diff line number Diff line
@@ -15,20 +15,6 @@ 
-->



<resources>

<!-- Dragging-->

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

    <dimen name="drop_target_bottom_margin">32dp</dimen>



<!-- Dynamic grid -->

    <dimen name="dynamic_grid_edge_margin">21.93dp</dimen>

    <dimen name="cell_layout_padding">29.33dp</dimen>



<!-- Hotseat -->

    <dimen name="spring_loaded_hotseat_top_margin">64dp</dimen>



<!-- AllApps -->

    <dimen name="all_apps_bottom_sheet_horizontal_padding">32dp</dimen>



    <!-- Widget picker-->

    <dimen name="widget_list_horizontal_margin">49dp</dimen>