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

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

Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage 

Change-Id: Ifd0d717d70aff4c83c9eb5cba397d04500b2c869
parent f1468af6

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.folder.FolderIcon

<com.android.launcher3.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.folder.FolderIcon>
 
</com.android.launcher3.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.Folder xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.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.Folder>
 
 No newline at end of file
 
</com.android.launcher3.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.Folder xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.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.Folder>
 
</com.android.launcher3.Folder>

src/com/android/launcher3/BubbleTextView.java

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 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

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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;
@@ -54,8 +53,7 @@ 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.folder.FolderIcon;

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

import com.android.launcher3.FolderIcon.FolderRingAnimator;

import com.android.launcher3.util.ParcelableSparseArray;

import com.android.launcher3.util.Thunk;