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

Commit 16d26d88 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '000-s-fixes' into 'v1-s' 

Various fixes done during seventh and eighth test session

See merge request e/os/BlissLauncher3!7
parents b455d3c4 aef2d2ae

Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -100,13 +100,6 @@ java_library { 
    min_sdk_version: min_launcher3_sdk_version,

}



java_import {

    name: "libGoogleFeed",

    jars: [

        "libs/libGoogleFeed.jar",

    ],

}



// Library with all the dependencies for building Launcher3

android_library {

    name: "Launcher3ResLib",
@@ -124,7 +117,6 @@ android_library { 
        "androidx.cardview_cardview",

        "com.google.android.material_material",

        "iconloader_base",

        "libGoogleFeed",

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",

bliss/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
            android:clearTaskOnLaunch="true"

            android:excludeFromRecents="true"

            android:exported="true"

            android:label="Remove Widgets"

            android:label="@string/remove_widgets"

            android:theme="@style/HomeSettings.Theme" />



        <!-- Dummy receiver for the migration of weather app -->

bliss/res/layout/search_container_workspace_v2.xml

+2 −2
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ 
                tools:ignore="FragmentTagUsage" />



            <LinearLayout

                android:id="@+id/manage_widget_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center_horizontal"

                android:orientation="horizontal"

                android:paddingTop="10dp">

                android:orientation="horizontal">



                <foundation.e.bliss.blur.BlurLayout

                    android:layout_width="wrap_content"

bliss/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,4 +28,5 @@ 
    <string name="widget_no_resize">Cannot resize this widget</string>

    <string name="widget_add">Add</string>

    <string name="widget_remove">Remove</string>

    <string name="remove_widgets">Remove Widgets</string>

</resources>

bliss/src/foundation/e/bliss/LauncherAppMonitor.java

+4 −1
Original line number Diff line number Diff line
@@ -99,10 +99,13 @@ public class LauncherAppMonitor extends LauncherApps.Callback 


    public LauncherAppMonitor(Context context) {

        context.getSystemService(LauncherApps.class).registerCallback(this);

        Utilities.getPrefs(context).registerOnSharedPreferenceChangeListener(this);

        mMultiModeController = new MultiModeController(context, this);

    }



    public void onUserUnlocked(Context context) {

        Utilities.getPrefs(context).registerOnSharedPreferenceChangeListener(this);

    }



    @Override

    public void onLauncherPreCreate(Launcher launcher) {

        if (mLauncher != null) {