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

Commit edfdc2fe authored by Sahil Sonar's avatar Sahil Sonar 💬
Browse files

Mour fixes

parent 5e774f17

bliss/src/foundation/e/bliss/widgets/AddedWidgetsAdapter.kt

+3 −3
Original line number Diff line number Diff line
@@ -69,9 +69,9 @@ class AddedWidgetsAdapter(private val mContext: Context, private val mDensity: I 
        var actionBtn: ImageView



        init {

            icon = itemView.findViewById(R.id.widget_icon)

            label = itemView.findViewById(R.id.widget_label)

            actionBtn = itemView.findViewById(R.id.action_image_view)

            icon = itemView.findViewById(R.id.widget_icon)!!

            label = itemView.findViewById(R.id.widget_label)!!

            actionBtn = itemView.findViewById(R.id.action_image_view)!!

        }

    }

bliss/src/foundation/e/bliss/widgets/WidgetContainer.kt

+2 −2
Original line number Diff line number Diff line
@@ -74,13 +74,13 @@ class WidgetContainer(context: Context, attrs: AttributeSet?) : FrameLayout(cont 
            WidgetsFullSheet.show(mLauncher, true, true)

        }



        findViewById<Button>(R.id.remove_widgets).setOnClickListener {

        findViewById<Button>(R.id.remove_widgets)!!.setOnClickListener {

            val intent =

                Intent(context, WidgetsActivity::class.java).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

            context.startActivity(intent)

        }



        mRemoveWidgetLayout = findViewById(R.id.remove_widget_parent)

        mRemoveWidgetLayout = findViewById(R.id.remove_widget_parent)!!

        mWrapper =

            findViewWithTag<LinearLayout?>("wrapper_children").apply {

                addOnLayoutChangeListener(layoutListener)

bliss/src/foundation/e/bliss/widgets/WidgetsActivity.kt

+5 −5
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ class WidgetsActivity : Activity(), OnActionClickListener { 


        val addedWidgets = findViewById<RecyclerView>(R.id.added_widgets_recycler_view)

        addedWidgets.apply {

            addedWidgets.layoutManager = LinearLayoutManager(this@WidgetsActivity)

            addedWidgets.setHasFixedSize(false)

            addedWidgets.isNestedScrollingEnabled = false

            addedWidgets.addItemDecoration(

            addedWidgets?.layoutManager = LinearLayoutManager(this@WidgetsActivity)

            addedWidgets?.setHasFixedSize(false)

            addedWidgets?.isNestedScrollingEnabled = false

            addedWidgets?.addItemDecoration(

                DividerItemDecoration(this@WidgetsActivity, DividerItemDecoration.VERTICAL)

            )

        }
@@ -65,7 +65,7 @@ class WidgetsActivity : Activity(), OnActionClickListener { 
        windowManager.defaultDisplay.getMetrics(metrics)



        mAddedWidgetsAdapter = AddedWidgetsAdapter(this, metrics.densityDpi)

        addedWidgets.adapter = mAddedWidgetsAdapter

        addedWidgets?.adapter = mAddedWidgetsAdapter

        refreshRecyclerView()

    }

src/com/android/launcher3/Workspace.java

+4 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,10 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T> 
        return mScreenOrder;

    }



    protected View getFirstPagePinnedItem() {

        return mFirstPagePinnedItem;

    }



    /**

     * Returns the screen ID of a page that is shown together with the given page screen ID when the

     * two panel UI is enabled.