From be40b29097ec3c3b2fa7db59f278600ac12b9c45 Mon Sep 17 00:00:00 2001 From: Samuel Fufa Date: Mon, 18 May 2020 12:50:29 -0700 Subject: [PATCH] Allow hotseat edu in landscape mode Screenshot: https://screenshot.googleplex.com/bTXH04qQRog Bug: 152362405 Test: Manual Change-Id: I8a9926e82794b11ab1b0fbce742f6b075e220c85 --- .../hybridhotseat/HotseatEduDialog.java | 22 ++++++++++++++----- quickstep/res/values/strings.xml | 2 ++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java index fa137f814c..c60853923b 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java @@ -144,11 +144,23 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable int rightInset = insets.right - mInsets.right; int bottomInset = insets.bottom - mInsets.bottom; mInsets.set(insets); - setPadding(leftInset, getPaddingTop(), rightInset, 0); - mHotseatWrapper.setPadding(mHotseatWrapper.getPaddingLeft(), getPaddingTop(), - mHotseatWrapper.getPaddingRight(), bottomInset); - mHotseatWrapper.getLayoutParams().height = - mLauncher.getDeviceProfile().hotseatBarSizePx + insets.bottom; + 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) { diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index be1d47b9f2..d05d164495 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -65,8 +65,10 @@ Get app suggestions on the bottom row of your Home screen + Get app suggestions on favorites row of your Home screen 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. + 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. 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.