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 538b7f3952..7986c269bc 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
@@ -35,7 +35,6 @@ import com.android.launcher3.Insettable;
import com.android.launcher3.Launcher;
import com.android.launcher3.R;
import com.android.launcher3.WorkspaceItemInfo;
-import com.android.launcher3.WorkspaceLayoutManager;
import com.android.launcher3.anim.Interpolators;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.logging.UserEventDispatcher;
@@ -54,9 +53,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
private static final int DEFAULT_CLOSE_DURATION = 200;
protected static final int FINAL_SCRIM_BG_COLOR = 0x88000000;
- // We don't migrate if user has more than SAME_PAGE_MAX_ROWS rows of item in their screen
- private static final int SAME_PAGE_MAX_ROWS = 2;
-
private static final int MIGRATE_SAME_PAGE = 0;
private static final int MIGRATE_NEW_PAGE = 1;
private static final int MIGRATE_NO_MIGRATE = 2;
@@ -228,19 +224,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements Insettable
if (FeatureFlags.HOTSEAT_MIGRATE_NEW_PAGE.get()) {
mEduContent.setText(R.string.hotseat_edu_message_migrate_alt);
mMigrationMode = MIGRATE_NEW_PAGE;
- return;
- }
- CellLayout page = mLauncher.getWorkspace().getScreenWithId(
- WorkspaceLayoutManager.FIRST_SCREEN_ID);
-
- int maxItemsOnPage = SAME_PAGE_MAX_ROWS * mLauncher.getDeviceProfile().inv.numColumns
- + (FeatureFlags.QSB_ON_FIRST_SCREEN ? 1 : 0);
- if (page.getShortcutsAndWidgets().getChildCount() > maxItemsOnPage
- || !page.makeSpaceForHotseatMigration(false)) {
- mMigrationMode = MIGRATE_NO_MIGRATE;
- mEduContent.setText(R.string.hotseat_edu_message_no_migrate);
- mEduHeading.setText(R.string.hotseat_edu_title_no_migrate);
- mDismissBtn.setVisibility(GONE);
}
}
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 90d42456d2..b55b042dda 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -68,30 +68,25 @@
- Get app suggestions based on your routines
+ Easily access your most-used apps
- Tap to set up
-
+ Pixel predicts apps you\’ll need next, right on your Home screen. Tap to set up.
- Suggested apps replace the bottom row of apps
- Your hotseat items will be moved up on the homescreen
- Your hotseat items will be moved to the last page of your workspace
+ Get app suggestions on the bottom row of your Home screen
-
-
- Suggested apps will be found at the bottom row of your home screen
- Drag one or many apps off the bottom row of home screen to see app suggestions
+ 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 on the bottom row will move to a new folder.
- Bottom row of apps moved up.
- Bottom row of apps moved to last page.
+ Your hotseat items have been moved up to your homescreen
+ Your hotseat items have been moved to a folder
- Bottom row won\'t be replaced. Manually drag apps for predictions.
+ Drag apps off the bottom row to see app suggestions
- Got it
+ Get app suggestions
- No thanks
+ No thanks
diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml
index dbcdbdb88f..264e27375c 100644
--- a/res/layout/work_tab_footer.xml
+++ b/res/layout/work_tab_footer.xml
@@ -41,6 +41,7 @@
android:lines="1"
android:minHeight="24dp"
android:paddingEnd="12dp"
+ android:text="@string/work_profile_toggle_label"
android:textSize="16sp"/>
Work profile
- Personal apps are private & can\'t be seen by IT
+ Personal data is separate & hidden from work apps
- Work apps are badged & visible to IT
+ Work apps & data are visible to your IT admin
Next
Got it
-
- Work apps: On
-
- Work apps: Paused
+
+ Work profile is paused
+
+ Work apps can\’t send you notifications, use your battery, or access your location
- Work apps are paused
- You won\'t get any work notifications, and your IT admin can\'t see your location
+
+ Pause work apps and notifications
Failed: %1$s
diff --git a/src/com/android/launcher3/views/WorkFooterContainer.java b/src/com/android/launcher3/views/WorkFooterContainer.java
index 9ac82301eb..d86d0ffd89 100644
--- a/src/com/android/launcher3/views/WorkFooterContainer.java
+++ b/src/com/android/launcher3/views/WorkFooterContainer.java
@@ -112,8 +112,6 @@ public class WorkFooterContainer extends LinearLayout implements Insettable {
boolean anyProfileQuietModeEnabled = UserCache.INSTANCE.get(
getContext()).isAnyProfileQuietModeEnabled();
- mWorkModeLabel.setText(anyProfileQuietModeEnabled
- ? R.string.work_mode_off_label : R.string.work_mode_on_label);
mWorkModeLabel.setCompoundDrawablesWithIntrinsicBounds(
anyProfileQuietModeEnabled ? R.drawable.ic_corp_off : R.drawable.ic_corp, 0, 0, 0);
mWorkModeSwitch.refresh();