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

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

Merge "Allow hotseat edu in landscape mode" into ub-launcher3-rvc-dev

parents 441e5b76 be40b290

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

+17 −5
Original line number Diff line number Diff line
@@ -145,11 +145,23 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable 
        int rightInset = insets.right - mInsets.right;

        int bottomInset = insets.bottom - mInsets.bottom;

        mInsets.set(insets);

        if (mLauncher.getOrientation() == Configuration.ORIENTATION_PORTRAIT) {

            setPadding(leftInset, getPaddingTop(), rightInset, 0);

            mHotseatWrapper.setPadding(mHotseatWrapper.getPaddingLeft(), getPaddingTop(),

                    mHotseatWrapper.getPaddingRight(), bottomInset);

            mHotseatWrapper.getLayoutParams().height =

                    mLauncher.getDeviceProfile().hotseatBarSizePx + insets.bottom;



        } else {

            setPadding(0, getPaddingTop(), 0, 0);

            mHotseatWrapper.setPadding(mHotseatWrapper.getPaddingLeft(), getPaddingTop(),

                    mHotseatWrapper.getPaddingRight(),

                    (int) getResources().getDimension(R.dimen.bottom_sheet_edu_padding));

            ((TextView) findViewById(R.id.hotseat_edu_heading)).setText(

                    R.string.hotseat_edu_title_migrate_landscape);

            ((TextView) findViewById(R.id.hotseat_edu_content)).setText(

                    R.string.hotseat_edu_message_migrate_landscape);

        }

    }



    private void logUserAction(boolean migrated, int pageIndex) {

quickstep/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ 


    <!-- Hotseat educational strings for users who don't qualify for migration -->

    <string name="hotseat_edu_title_migrate">Get app suggestions on the bottom row of your Home screen</string>

    <string name="hotseat_edu_title_migrate_landscape">Get app suggestions on favorites row of your Home screen</string>



    <string name="hotseat_edu_message_migrate">Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move up to your Home screen. </string>

    <string name="hotseat_edu_message_migrate_landscape">Easily access your most-used apps right on the Home screen. Suggestions will change based on your routines. Apps in favorites row will move to your Home screen. </string>

    <string name="hotseat_edu_message_migrate_alt">Easily access your most-used apps, right on the Home screen. Suggestions will change based on your routines. Apps on the bottom row will move to a new folder.</string>



    <!-- Button text to opt in for fully predicted hotseat -->