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

Unverified Commit 0b623c3e authored by Yash Garg's avatar Yash Garg 💬 Committed by Yash-Garg
Browse files

cleanup: move all the stuff to main from apiOreo

parent cc467bad

app/build.gradle.kts

+0 −17
Original line number Diff line number Diff line
@@ -113,23 +113,6 @@ android { 
    buildFeatures { viewBinding = true }



    lint { abortOnError = false }



    sourceSets {

        getByName("apiQ") {

            java.srcDir("src/apiOreo/java")

            res.srcDir("src/apiOreo/res")

        }



        getByName("apiR") {

            java.srcDir("src/apiOreo/java")

            res.srcDir("src/apiOreo/res")

        }



        getByName("apiS") {

            java.srcDir("src/apiOreo/java")

            res.srcDir("src/apiOreo/res")

        }

    }

}



dependencies {

app/src/apiOreo/AndroidManifest.xml

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

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

    <uses-permission android:name="lineageos.permission.ACCESS_WEATHER_MANAGER"/>

    <uses-permission android:name="lineageos.permission.READ_WEATHER"/>

</manifest>

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+2 −3
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ public class LauncherActivity extends AppCompatActivity 
            OnSwipeDownListener,

            WallpaperManagerCompat.OnColorsChangedListener {



    private static final int WIDGET_PAGE = 0;

    public static final int REORDER_TIMEOUT = 350;

    private final static int EMPTY_LOCATION_DRAG = -999;

    private static final int REQUEST_PERMISSION_CALL_PHONE = 14;
@@ -1340,9 +1341,7 @@ public class LauncherActivity extends AppCompatActivity 
                mDeviceProfile.iconDrawablePaddingPx / 2, 0);



        // If a user taps outside (background / space) stop wobbling

        grid.setOnClickListener(view -> {

            handleWobbling(false);

        });

        grid.setOnClickListener(view -> handleWobbling(false));



        return grid;

    }

app/src/apiOreo/java/foundation/e/blisslauncher/features/weather/CustomLocationPreference.java→app/src/main/java/foundation/e/blisslauncher/features/weather/CustomLocationPreference.java

+0 −0

File moved.

View file