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

Commit 1e16e15d authored by Winson Chung's avatar Winson Chung Committed by Android Git Automerger
Browse files

am 88400d52: Merge "Initial changes to support smaller landscape layouts." into jb-ub-now-jetsonic 

* commit '88400d52':
  Initial changes to support smaller landscape layouts.
parents 3e232794 88400d52

res/layout/folder_icon.xml

+4 −1
Original line number Diff line number Diff line
@@ -30,5 +30,8 @@ 
        android:src="@drawable/portal_ring_inner_holo"/>

    <com.android.launcher3.BubbleTextView

        style="@style/WorkspaceIcon"

        android:id="@+id/folder_icon_name" />

        android:id="@+id/folder_icon_name"

        android:layout_gravity="top"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

</com.android.launcher3.FolderIcon>

res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
    <dimen name="dynamic_grid_search_bar_max_width">500dp</dimen>

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

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

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



<!-- Wallpaper picker -->

    <dimen name="wallpaperThumbnailWidth">106.5dp</dimen>

res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
    <style name="WorkspaceIcon.AppsCustomize">

        <item name="android:background">@null</item>

        <item name="android:textColor">@color/apps_customize_icon_text_color</item>

        <item name="android:drawablePadding">4dp</item>

        <item name="android:drawablePadding">@dimen/dynamic_grid_icon_drawable_padding</item>

        <item name="android:shadowRadius">4.0</item>

        <item name="android:shadowColor">#FF000000</item>

    </style>

src/com/android/launcher3/BubbleTextView.java

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class BubbleTextView extends TextView { 
        // Ensure we are using the right text size

        LauncherAppState app = LauncherAppState.getInstance();

        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();

        setTextSize(TypedValue.COMPLEX_UNIT_SP, grid.iconTextSize);

        setTextSize(TypedValue.COMPLEX_UNIT_PX, grid.iconTextSizePx);

        setTextColor(getResources().getColor(R.color.workspace_icon_text_color));

    }
@@ -111,7 +111,7 @@ public class BubbleTextView extends TextView { 


        setCompoundDrawables(null,

                Utilities.createIconDrawable(b), null, null);

        setCompoundDrawablePadding((int) ((grid.folderIconSizePx - grid.iconSizePx) / 2f));

        setCompoundDrawablePadding(grid.iconDrawablePaddingPx);

        setText(info.title);

        setTag(info);

    }

src/com/android/launcher3/CellLayout.java

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ public class CellLayout extends ViewGroup { 
        setAlwaysDrawnWithCacheEnabled(false);



        final Resources res = getResources();

        mHotseatScale = (float) grid.hotseatIconSize / grid.iconSize;

        mHotseatScale = (float) grid.hotseatIconSizePx / grid.iconSizePx;



        mNormalBackground = res.getDrawable(R.drawable.screenpanel);

        mActiveGlowBackground = res.getDrawable(R.drawable.screenpanel_hover);