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

Commit e47eb056 authored by Amit's avatar Amit
Browse files

Merge branch 'develop'

parents 70bda9b9 4c6cb39b

app/src/main/java/org/indin/blisslaunchero/features/launcher/LauncherActivity.java

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ public class LauncherActivity extends AppCompatActivity implements 
    protected void onResume() {

        super.onResume();

        Log.d(TAG, "onResume() called");

        overridePendingTransition(R.anim.reenter, R.anim.releave);

    }



    @Override

app/src/main/java/org/indin/blisslaunchero/framework/DeviceProfile.java

+5 −5
Original line number Diff line number Diff line
@@ -219,15 +219,15 @@ public class DeviceProfile { 
    private void updateIconSize(float scale, Resources res, DisplayMetrics dm) {

        // Workspace

        if (availableWidthPx < 640) {

            iconSizePx = 90;

            iconSizePx = 95;

        } else if (availableWidthPx < 960) {

            iconSizePx = 120;

            iconSizePx = 126;

        } else if (availableWidthPx < 1100) {

            iconSizePx = 150;

            iconSizePx = 160;

        } else if (availableWidthPx < 1200) {

            iconSizePx = 180;

            iconSizePx = 190;

        } else {

            iconSizePx = 210;

            iconSizePx = 230;

        }

        iconTextSizePx = (int) (Utilities.pxFromSp(12, dm) * scale);

        iconDrawablePaddingPx = (availableWidthPx - iconSizePx * 4) / 5;

app/src/main/res/anim/reenter.xml

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:duration="@android:integer/config_longAnimTime"

    android:fromXDelta="-100%p"

    android:toXDelta="0%p">

</translate>
 
 No newline at end of file

app/src/main/res/anim/releave.xml

deleted100755 → 0
+0 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    android:duration="@android:integer/config_longAnimTime"

    android:fromXDelta="0%p"

    android:toXDelta="100%p">

</translate>
 
 No newline at end of file