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

Commit c3e4e228 authored by Jon Miranda's avatar Jon Miranda
Browse files

Remove unused code in DeviceProfile. 

Change-Id: I463302e6711ad39241257b8dff058d9f3e99d883
parent df3bc52c

res/values/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
    <dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>

    <!-- Minimum space between workspace and hotseat in spring loaded mode -->

    <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>

    <dimen name="dynamic_grid_container_land_left_padding">118dp</dimen>

    <dimen name="dynamic_grid_container_land_right_padding">66dp</dimen>



<!-- Drop target bar -->

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

src/com/android/launcher3/BaseContainerView.java

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public abstract class BaseContainerView extends FrameLayout 
        int paddingBottom;



        DeviceProfile grid = Launcher.getLauncher(context).getDeviceProfile();

        int[] padding = grid.getContainerPadding(context);

        int[] padding = grid.getContainerPadding();

        paddingLeft = padding[0] + grid.edgeMarginPx;

        paddingRight = padding[1] + grid.edgeMarginPx;

        if (!grid.isVerticalBarLayout()) {

src/com/android/launcher3/DeviceProfile.java

+1 −11
Original line number Diff line number Diff line
@@ -116,10 +116,6 @@ public class DeviceProfile { 
    public int allAppsIconDrawablePaddingPx;

    public float allAppsIconTextSizePx;



    // Containers

    private final int containerLeftPaddingPx;

    private final int containerRightPaddingPx;



    // Drop Target

    public int dropTargetBarSizePx;
@@ -184,10 +180,6 @@ public class DeviceProfile { 
        hotseatBarTopPaddingPx =

                res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_top_padding);

        hotseatLandGutterPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_hotseat_gutter_width);

        containerLeftPaddingPx =

                res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_left_padding);

        containerRightPaddingPx =

                res.getDimensionPixelSize(R.dimen.dynamic_grid_container_land_right_padding);



        // Determine sizes.

        widthPx = width;
@@ -588,9 +580,7 @@ public class DeviceProfile { 
    /**

     * @return the left/right paddings for all containers.

     */

    public final int[] getContainerPadding(Context context) {

        Resources res = context.getResources();



    public final int[] getContainerPadding() {

        // No paddings for portrait phone

        if (isPhone && !isVerticalBarLayout()) {

            return new int[] {0, 0};