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

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

Merge "Final strings for work profile and hybrid hotseat" into rvc-dev

parents f82a40ce 365277a3
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
@@ -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);
        }
    }

+10 −15
Original line number Diff line number Diff line
@@ -68,30 +68,25 @@


    <!-- Hotseat migration notification title -->
    <string translatable="false" name="hotseat_edu_prompt_title">Get app suggestions based on your routines</string>
    <string name="hotseat_edu_prompt_title">Easily access your most-used apps</string>
    <!-- Hotseat migration notification content -->
    <string translatable="false" name="hotseat_edu_prompt_content">Tap to set up</string>

    <string name="hotseat_edu_prompt_content">Pixel predicts apps you\’ll need next, right on your Home screen. Tap to set up.</string>

    <!-- Hotseat educational strings for users who don't qualify for migration -->
    <string translatable="false" name="hotseat_edu_title_migrate">Suggested apps replace the bottom row of apps</string>
    <string translatable="false" name="hotseat_edu_message_migrate">Your hotseat items will be moved up on the homescreen</string>
    <string translatable="false" name="hotseat_edu_message_migrate_alt">Your hotseat items will be moved to the last page of your workspace</string>

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

    <!-- Hotseat educational strings for users who don't qualify -->
    <string translatable="false" name="hotseat_edu_title_no_migrate">Suggested apps will be found at the bottom row of your home screen</string>
    <string translatable="false" name="hotseat_edu_message_no_migrate">Drag one or many apps off the bottom row of home screen to see app suggestions</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_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>

    <!-- Toast message user sees after opting into fully predicted hybrid hotseat -->
    <string translatable="false" name="hotseat_items_migrated">Bottom row of apps moved up.</string>
    <string translatable="false" name="hotseat_items_migrated_alt">Bottom row of apps moved to last page.</string>
    <string name="hotseat_items_migrated">Your hotseat items have been moved up to your homescreen</string>
    <string name="hotseat_items_migrated_alt">Your hotseat items have been moved to a folder</string>
    <!-- Toast message user sees after opting into fully predicted hybrid hotseat -->
    <string translatable="false" name="hotseat_no_migration">Bottom row won\'t be replaced. Manually drag apps for predictions.</string>
    <string name="hotseat_no_migration">Drag apps off the bottom row to see app suggestions</string>
    <!-- Button text to opt in for fully predicted hotseat -->
    <string translatable="false" name="hotseat_edu_accept">Got it</string>
    <string name="hotseat_edu_accept">Get app suggestions</string>
    <!-- Button text to dismiss opt in for fully predicted hotseat -->
    <string translatable="false" name="hotseat_edu_dismiss">No thanks</string>
    <string name="hotseat_edu_dismiss">No thanks</string>


    <!-- Title shown during interactive part of Back gesture tutorial for right edge. [CHAR LIMIT=30] -->
+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@
        android:lines="1"
        android:minHeight="24dp"
        android:paddingEnd="12dp"
        android:text="@string/work_profile_toggle_label"
        android:textSize="16sp"/>
    <com.android.launcher3.allapps.WorkModeSwitch
        android:id="@+id/work_mode_toggle"
+8 −9
Original line number Diff line number Diff line
@@ -328,22 +328,21 @@
    <!-- This string is in the work profile tab when a user has All Apps open on their phone. This is a label for a toggle to turn the work profile on and off. "Work profile" means a separate profile on a user's phone that's specifically for their work apps and managed by their company. "Work" is used as an adjective.-->
    <string name="work_profile_toggle_label">Work profile</string>
    <!--- User onboarding title for personal apps -->
    <string name="work_profile_edu_personal_apps">Personal apps are private &amp; can\'t be seen by IT</string>
    <string name="work_profile_edu_personal_apps">Personal data is separate &amp; hidden from work apps</string>
    <!--- User onboarding title for work profile apps -->
    <string name="work_profile_edu_work_apps">Work apps are badged &amp; visible to IT</string>
    <string name="work_profile_edu_work_apps">Work apps &amp; data are visible to your IT admin</string>
    <!-- Action label to proceed to the next work profile edu section-->
    <string name="work_profile_edu_next">Next</string>
    <!-- Action label to finish work profile edu-->
    <string name="work_profile_edu_accept">Got it</string>

    <!-- This string is in the work profile tab when a user has All Apps open on their phone. It describes the label of a toggle, "Work profile," as being managed by the user's employer.
    "Organization" is used to represent a variety of businesses, non-profits, and educational institutions).-->
    <string name="work_mode_on_label">Work apps: On</string>
    <!-- This string appears under a the label of a toggle in the work profile tab on a user's phone. It describes the status of the toggle, "Work profile," when it's turned off. "Work profile" means a separate profile on a user's phone that's speficially for their work apps and is managed by their company.-->
    <string name="work_mode_off_label">Work apps: Paused</string>
    <!--- heading shown when user opens work apps tab while work apps are paused -->
    <string name="work_apps_paused_title">Work profile is paused</string>
    <!--- body shown when user opens work apps tab while work apps are paused -->
    <string name="work_apps_paused_body">Work apps can\’t send you notifications, use your battery, or access your location</string>

    <string name="work_apps_paused_title">Work apps are paused</string>
    <string name="work_apps_paused_body">You won\'t get any work notifications, and your IT admin can\'t see your location</string>
    <!-- A tip shown pointing at work toggle -->
    <string name="work_switch_tip">Pause work apps and notifications</string>

    <!-- Failed action error message: e.g. Failed: Pause -->
    <string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
+0 −2
Original line number Diff line number Diff line
@@ -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();