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

Commit aeb185e7 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "Clean up work profile" into ub-launcher3-master

parents b8d1e352 ccebfbe2

quickstep/recents_ui_overrides/res/drawable/hotseat_edu_notification_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ 
-->

<vector android:height="24dp" android:viewportHeight="24"

    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="@color/bottom_panel_background" android:pathData="M19 9l1.25-2.75L23 5l-2.75-1.25L19 1l-1.25 2.75L15 5l2.75 1.25L19 9zm-7.5.5L9 4 6.5 9.5 1 12l5.5 2.5L9 20l2.5-5.5L17 12l-5.5-2.5zM19 15l-1.25 2.75L15 19l2.75 1.25L19 23l1.25-2.75L23 19l-2.75-1.25L19 15z"/>

    <path android:fillColor="?android:attr/colorAccent" android:pathData="M19 9l1.25-2.75L23 5l-2.75-1.25L19 1l-1.25 2.75L15 5l2.75 1.25L19 9zm-7.5.5L9 4 6.5 9.5 1 12l5.5 2.5L9 20l2.5-5.5L17 12l-5.5-2.5zM19 15l-1.25 2.75L15 19l2.75 1.25L19 23l1.25-2.75L23 19l-2.75-1.25L19 15z"/>

</vector>

quickstep/recents_ui_overrides/res/layout/predicted_hotseat_edu.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
    <View

        android:layout_width="match_parent"

        android:layout_height="32dp"

        android:backgroundTint="@color/bottom_panel_background"

        android:backgroundTint="?android:attr/colorAccent"

        android:background="@drawable/bottom_sheet_top_border" />



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="@color/bottom_panel_background"

        android:background="?android:attr/colorAccent"

        android:orientation="vertical">



        <TextView

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduController.java

+2 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.launcher3.R; 
import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.ActivityTracker;

import com.android.launcher3.util.Themes;



import java.util.List;
@@ -109,7 +110,7 @@ public class HotseatEduController { 
                NOTIFICATION_CHANNEL_ID)

                .setContentTitle(name)

                .setOngoing(true)

                .setColor(mLauncher.getColor(R.color.bottom_panel_background))

                .setColor(Themes.getColorAccent(mLauncher))

                .setContentIntent(PendingIntent.getActivity(mLauncher, 0, intent,

                        PendingIntent.FLAG_CANCEL_CURRENT))

                .setSmallIcon(R.drawable.hotseat_edu_notification_icon)

quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable 
                || predictions.size() < mLauncher.getDeviceProfile().inv.numHotseatIcons) {

            return;

        }

        mLauncher.getDragLayer().addView(this);

        attachToContainer();

        logOnBoardingSeen();

        animateOpen();

        for (int i = 0; i < mLauncher.getDeviceProfile().inv.numHotseatIcons; i++) {

quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ public class AllAppsState extends LauncherState { 
        dispatchWindowStateChanged(launcher);

    }



    @Override

    public void onStateDisabled(Launcher launcher) {

        super.onStateDisabled(launcher);

        AbstractFloatingView.closeAllOpenViews(launcher);

    }



    @Override

    public String getDescription(Launcher launcher) {

        AllAppsContainerView appsView = launcher.getAppsView();