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

Commit b29daf57 authored by Anushree Ganjam's avatar Anushree Ganjam Committed by Android (Google) Code Review
Browse files

Merge "Add FastScrollSectionInfo with "info icon" when work educard exists." into main

parents 2b9047a9 6dadf21a

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ 
    <string name="work_profile_edu_work_apps">Work apps are badged and visible to your IT admin</string>

    <!-- Action label to finish work profile edu-->

    <string name="work_profile_edu_accept">Got it</string>

    <!-- Info icon unicode for alpha scroller when work edu card is present -->

    <string name="work_profile_edu_section" translatable="false">\u24D8</string>



    <!--- heading shown when user opens work apps tab while work apps are paused -->

    <string name="work_apps_paused_title">Work apps are paused</string>

src/com/android/launcher3/allapps/AlphabeticalAppsList.java

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import androidx.annotation.VisibleForTesting; 
import androidx.recyclerview.widget.DiffUtil;



import com.android.launcher3.Flags;

import com.android.launcher3.R;

import com.android.launcher3.allapps.BaseAllAppsAdapter.AdapterItem;

import com.android.launcher3.model.data.AppInfo;

import com.android.launcher3.model.data.ItemInfo;
@@ -272,6 +273,12 @@ public class AlphabeticalAppsList<T extends Context & ActivityContext> implement 
                addApps = mWorkProviderManager.shouldShowWorkApps();

            }

            if (addApps) {

                if (/* education card was added */ position == 1) {

                    // Add work educard section with "info icon" at 0th position.

                    mFastScrollerSections.add(new FastScrollSectionInfo(

                            mActivityContext.getResources().getString(

                                    R.string.work_profile_edu_section), 0));

                }

                position = addAppsWithSections(mApps, position);

            }

            if (Flags.enablePrivateSpace()) {

src/com/android/launcher3/allapps/WorkEduCard.java

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ public class WorkEduCard extends FrameLayout implements 
            AllAppsRecyclerView rv = mActivityContext.getAppsView().mAH.get(

                    ActivityAllAppsContainerView.AdapterHolder.WORK).mRecyclerView;

            rv.getApps().getAdapterItems().remove(mPosition);

            // Remove the educard fast scroll section.

            rv.getApps().getFastScrollerSections().remove(0);

            rv.getAdapter().notifyItemRemoved(mPosition);

        }

    }