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

Commit c6b833dc authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing all compatibility code below Lollipop" into ub-launcher3-master

parents c9c57631 a52ecb03

build.gradle

+6 −5
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ apply plugin: 'com.android.application' 
apply plugin: 'com.google.protobuf'



android {

    compileSdkVersion 25

    compileSdkVersion 26

    buildToolsVersion '24.0.0'



    defaultConfig {

        minSdkVersion 21

        targetSdkVersion 25

        targetSdkVersion 26

        versionCode 1

        versionName "1.0"
@@ -59,10 +59,11 @@ repositories { 
    mavenCentral()

}



final String SUPPORT_LIBS_VERSION = '26.0.0-SNAPSHOT'

dependencies {

    compile 'com.android.support:support-v4:23.1.1'

    compile 'com.android.support:recyclerview-v7:23.1.1'

    compile 'com.android.support:palette-v7:23.2.0'

    compile "com.android.support:support-v4:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:recyclerview-v7:${SUPPORT_LIBS_VERSION}"

    compile "com.android.support:palette-v7:${SUPPORT_LIBS_VERSION}"

    compile 'com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-2'



    testCompile 'junit:junit:4.12'

src/com/android/launcher3/BubbleTextView.java

+1 −5
Original line number Diff line number Diff line
@@ -524,11 +524,7 @@ public class BubbleTextView extends TextView 


    protected void applyCompoundDrawables(Drawable icon) {

        if (mLayoutHorizontal) {

            if (Utilities.ATLEAST_JB_MR1) {

            setCompoundDrawablesRelative(icon, null, null, null);

            } else {

                setCompoundDrawables(icon, null, null, null);

            }

        } else {

            setCompoundDrawables(null, icon, null, null);

        }

src/com/android/launcher3/ButtonDropTarget.java

+3 −26
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.FloatArrayEvaluator; 
import android.animation.ObjectAnimator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.annotation.TargetApi;

import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Resources;
@@ -30,7 +29,6 @@ import android.graphics.ColorMatrix; 
import android.graphics.ColorMatrixColorFilter;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;
@@ -100,17 +98,11 @@ public abstract class ButtonDropTarget extends TextView 
        mOriginalTextColor = getTextColors();

    }



    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)

    protected void setDrawable(int resId) {

        // We do not set the drawable in the xml as that inflates two drawables corresponding to

        // drawableLeft and drawableStart.

        mDrawable = getResources().getDrawable(resId);



        if (Utilities.ATLEAST_JB_MR1) {

        setCompoundDrawablesRelativeWithIntrinsicBounds(mDrawable, null, null, null);

        } else {

            setCompoundDrawablesWithIntrinsicBounds(mDrawable, null, null, null);

        }

    }



    public void setDropTargetBar(DropTargetBar dropTargetBar) {
@@ -120,16 +112,7 @@ public abstract class ButtonDropTarget extends TextView 
    @Override

    public final void onDragEnter(DragObject d) {

        d.dragView.setColor(mHoverColor);

        if (Utilities.ATLEAST_LOLLIPOP) {

        animateTextColor(mHoverColor);

        } else {

            if (mCurrentFilter == null) {

                mCurrentFilter = new ColorMatrix();

            }

            DragView.setColorScale(mHoverColor, mCurrentFilter);

            mDrawable.setColorFilter(new ColorMatrixColorFilter(mCurrentFilter));

            setTextColor(mHoverColor);

        }

        if (d.stateAnnouncer != null) {

            d.stateAnnouncer.cancel();

        }
@@ -142,15 +125,9 @@ public abstract class ButtonDropTarget extends TextView 
    }



    protected void resetHoverColor() {

        if (Utilities.ATLEAST_LOLLIPOP) {

        animateTextColor(mOriginalTextColor.getDefaultColor());

        } else {

            mDrawable.setColorFilter(null);

            setTextColor(mOriginalTextColor);

        }

    }



    @TargetApi(Build.VERSION_CODES.LOLLIPOP)

    private void animateTextColor(int targetColor) {

        if (mCurrentColorAnim != null) {

            mCurrentColorAnim.cancel();

src/com/android/launcher3/CellLayout.java

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.animation.TimeInterpolator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator.AnimatorUpdateListener;

import android.annotation.TargetApi;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.TypedArray;
@@ -33,7 +32,6 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.os.Parcelable;

import android.support.annotation.IntDef;

import android.support.v4.view.ViewCompat;
@@ -297,7 +295,6 @@ public class CellLayout extends ViewGroup implements BubbleTextShadowHandler { 
        addView(mShortcutsAndWidgets);

    }



    @TargetApi(Build.VERSION_CODES.LOLLIPOP)

    public void enableAccessibleDrag(boolean enable, int dragType) {

        mUseTouchHelper = enable;

        if (!enable) {

src/com/android/launcher3/Launcher.java

+5 −46
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.content.pm.ActivityInfo; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.database.sqlite.SQLiteDatabase;

import android.graphics.Bitmap;

import android.graphics.Point;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;
@@ -69,7 +68,6 @@ import android.view.KeyboardShortcutGroup; 
import android.view.KeyboardShortcutInfo;

import android.view.Menu;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.View;

import android.view.View.OnLongClickListener;

import android.view.ViewGroup;
@@ -89,7 +87,6 @@ import com.android.launcher3.allapps.AllAppsTransitionController; 
import com.android.launcher3.allapps.DefaultAppSearchController;

import com.android.launcher3.anim.AnimationLayerSet;

import com.android.launcher3.compat.AppWidgetManagerCompat;

import com.android.launcher3.compat.LauncherActivityInfoCompat;

import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.config.FeatureFlags;
@@ -1507,7 +1504,7 @@ public class Launcher extends Activity 
        launcherInfo.spanY = itemInfo.spanY;

        launcherInfo.minSpanX = itemInfo.minSpanX;

        launcherInfo.minSpanY = itemInfo.minSpanY;

        launcherInfo.user = mAppWidgetManager.getUser(appWidgetInfo);

        launcherInfo.user = appWidgetInfo.getUser();



        LauncherModel.addItemToDatabase(this, launcherInfo,

                itemInfo.container, itemInfo.screenId, itemInfo.cellX, itemInfo.cellY);
@@ -2090,7 +2087,7 @@ public class Launcher extends Activity 
                intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);

                intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, info.componentName);

                intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE,

                        mAppWidgetManager.getUser(info.info));

                        info.info.getUser());

                // TODO: we need to make sure that this accounts for the options bundle.

                // intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_OPTIONS, options);

                startActivityForResult(intent, REQUEST_BIND_APPWIDGET);
@@ -2324,7 +2321,7 @@ public class Launcher extends Activity 
                    intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, info.appWidgetId);

                    intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER, appWidgetInfo.provider);

                    intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_PROVIDER_PROFILE,

                            mAppWidgetManager.getUser(appWidgetInfo));

                            appWidgetInfo.getUser());

                    startActivityForResult(intent, REQUEST_BIND_PENDING_APPWIDGET);

                }

            } else {
@@ -3483,7 +3480,7 @@ public class Launcher extends Activity 


                    // Also try to bind the widget. If the bind fails, the user will be shown

                    // a click to setup UI, which will ask for the bind permission.

                    PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(this, appWidgetInfo);

                    PendingAddWidgetInfo pendingInfo = new PendingAddWidgetInfo(appWidgetInfo);

                    pendingInfo.spanX = item.spanX;

                    pendingInfo.spanY = item.spanY;

                    pendingInfo.minSpanX = item.minSpanX;
@@ -3916,47 +3913,9 @@ public class Launcher extends Activity 
        }

    }



    private int mapConfigurationOriActivityInfoOri(int configOri) {

        final Display d = getWindowManager().getDefaultDisplay();

        int naturalOri = Configuration.ORIENTATION_LANDSCAPE;

        switch (d.getRotation()) {

        case Surface.ROTATION_0:

        case Surface.ROTATION_180:

            // We are currently in the same basic orientation as the natural orientation

            naturalOri = configOri;

            break;

        case Surface.ROTATION_90:

        case Surface.ROTATION_270:

            // We are currently in the other basic orientation to the natural orientation

            naturalOri = (configOri == Configuration.ORIENTATION_LANDSCAPE) ?

                    Configuration.ORIENTATION_PORTRAIT : Configuration.ORIENTATION_LANDSCAPE;

            break;

        }



        int[] oriMap = {

                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,

                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,

                ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,

                ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE

        };

        // Since the map starts at portrait, we need to offset if this device's natural orientation

        // is landscape.

        int indexOffset = 0;

        if (naturalOri == Configuration.ORIENTATION_LANDSCAPE) {

            indexOffset = 1;

        }

        return oriMap[(d.getRotation() + indexOffset) % 4];

    }



    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)

    public void lockScreenOrientation() {

        if (mRotationEnabled) {

            if (Utilities.ATLEAST_JB_MR2) {

            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);

            } else {

                setRequestedOrientation(mapConfigurationOriActivityInfoOri(getResources()

                        .getConfiguration().orientation));

            }

        }

    }