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

Commit 29aac6e2 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "First pass at new FolderIcon visual treatment" into ub-launcher3-calgary

parents 775d4c9a 119e8982

res/layout/user_folder_icon_normalized.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.launcher3.Folder xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.folder.Folder xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"
@@ -34,7 +34,7 @@ 
            android:layout_width="20dp"

            android:layout_height="20dp" />



        <com.android.launcher3.FolderPagedView

        <com.android.launcher3.folder.FolderPagedView

            android:id="@+id/folder_content"

            android:layout_width="match_parent"

            android:layout_height="match_parent"
@@ -82,4 +82,4 @@ 


    </LinearLayout>



</com.android.launcher3.Folder>
 
</com.android.launcher3.folder.Folder>

res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -138,8 +138,8 @@ 
    <dimen name="quantum_panel_outer_padding">4dp</dimen>



<!-- Folders -->

    <!-- The amount that the preview contents are inset from the preview background -->

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

    <!-- The size of the padding on the preview background drawable -->

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



<!-- Sizes for managed profile badges -->

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

src/com/android/launcher3/FastBitmapDrawable.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class FastBitmapDrawable extends Drawable { 
    private static final ColorMatrix sTempBrightnessMatrix = new ColorMatrix();

    private static final ColorMatrix sTempFilterMatrix = new ColorMatrix();



    private final Paint mPaint = new Paint(Paint.FILTER_BITMAP_FLAG);

    private final Paint mPaint = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG);

    private final Bitmap mBitmap;

    private State mState = State.NORMAL;

src/com/android/launcher3/allapps/AllAppsContainerView.java

+1 −1
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ import com.android.launcher3.DeviceProfile; 
import com.android.launcher3.DragSource;

import com.android.launcher3.DropTarget;

import com.android.launcher3.ExtendedEditText;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.ItemInfo;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherTransitionable;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.Workspace;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.util.ComponentKey;



import java.nio.charset.Charset;

src/com/android/launcher3/config/FeatureFlags.java

+2 −1
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ public final class FeatureFlags { 
    public static boolean IS_RELEASE_BUILD = true;



    // Custom flags go below this

    public static boolean LAUNCHER3_ICON_NORMALIZATION = false;

    // As opposed to the new spring-loaded workspace.

    public static boolean LAUNCHER3_LEGACY_WORKSPACE_DND = false;

    public static boolean LAUNCHER3_ICON_NORMALIZATION = true;

    public static boolean LAUNCHER3_CLIPPED_FOLDER_ICON = false;

}