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

Commit 26119438 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Revert "Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage" 

This reverts commit fc956e5a.

Change-Id: Ib3b5156b8fc3cad35c4634d61d5390c848ce1f93
parent 7de283a5

res/layout/folder_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<com.android.launcher3.FolderIcon

<com.android.launcher3.folder.FolderIcon

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -33,4 +33,4 @@ 
        android:layout_gravity="top"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

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

res/layout/user_folder.xml

+2 −2
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"
@@ -81,4 +81,4 @@ 


    </LinearLayout>



</com.android.launcher3.Folder>
 
 No newline at end of file
 
</com.android.launcher3.folder.Folder>
 
 No newline at end of file

res/layout/user_folder_icon_normalized.xml

+2 −2
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"
@@ -82,4 +82,4 @@ 


    </LinearLayout>



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

src/com/android/launcher3/BubbleTextView.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.view.ViewParent; 
import android.widget.TextView;



import com.android.launcher3.IconCache.IconLoadRequest;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.model.PackageItemInfo;



import java.text.NumberFormat;

src/com/android/launcher3/CellLayout.java

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.GradientDrawable;

import android.graphics.drawable.TransitionDrawable;

import android.os.Build;

import android.os.Parcelable;
@@ -53,7 +54,8 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper; 
import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.config.ProviderConfig;

import com.android.launcher3.FolderIcon.FolderRingAnimator;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.folder.FolderIcon.FolderRingAnimator;

import com.android.launcher3.util.ParcelableSparseArray;

import com.android.launcher3.util.Thunk;