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

Commit 25986be9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6314400 from e19a23a7 to rvc-release 

Change-Id: I73a8b5694de741701aadf5af3f734f0002afa373
parents a5a732d0 e19a23a7

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

+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);

        }

    }

quickstep/res/values/strings.xml

+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] -->

res/layout/work_tab_footer.xml

+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"

res/values-rm/strings.xml

deleted100644 → 0
+0 −203
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- 

/*

* Copyright (C) 2008 The Android Open Source Project

*

* Licensed under the Apache License, Version 2.0 (the "License");

* you may not use this file except in compliance with the License.

* You may obtain a copy of the License at

*

*      http://www.apache.org/licenses/LICENSE-2.0

*

* Unless required by applicable law or agreed to in writing, software

* distributed under the License is distributed on an "AS IS" BASIS,

* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

* See the License for the specific language governing permissions and

* limitations under the License.

*/

 -->



<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- no translation found for application_name (5181331383435256801) -->

    <skip />

    <!-- no translation found for home (7658288663002113681) -->

    <skip />

    <!-- no translation found for uid_name (7820867637514617527) -->

    <skip />

    <string name="folder_name" msgid="7371454440695724752"></string>

    <!-- no translation found for activity_not_found (8071924732094499514) -->

    <skip />

    <!-- no translation found for widgets_tab_label (2921133187116603919) -->

    <skip />

    <!-- no translation found for widget_adder (3201040140710381657) -->

    <skip />

    <!-- no translation found for toggle_weight_watcher (5645299835184636119) -->

    <skip />

    <!-- no translation found for long_press_widget_to_add (7699152356777458215) -->

    <skip />

    <!-- no translation found for market (2619650989819296998) -->

    <skip />

    <!-- no translation found for widget_dims_format (2370757736025621599) -->

    <skip />

    <!-- no translation found for external_drop_widget_error (3165821058322217155) -->

    <skip />

    <!-- no translation found for external_drop_widget_pick_title (3486317258037690630) -->

    <skip />

    <!-- no translation found for rename_folder_label (3727762225964550653) -->

    <skip />

    <!-- no translation found for rename_folder_title (3771389277707820891) -->

    <skip />

    <!-- no translation found for rename_action (5559600076028658757) -->

    <skip />

    <!-- no translation found for cancel_action (7009134900002915310) -->

    <skip />

    <!-- no translation found for menu_item_add_item (1264911265836810421) -->

    <skip />

    <!-- no translation found for group_applications (3797214114206693605) -->

    <skip />

    <!-- no translation found for group_shortcuts (6012256992764410535) -->

    <skip />

    <!-- no translation found for group_widgets (1569030723286851002) -->

    <skip />

    <!-- no translation found for completely_out_of_space (6106288382070760318) -->

    <skip />

    <!-- no translation found for out_of_space (4691004494942118364) -->

    <skip />

    <!-- no translation found for hotseat_out_of_space (7448809638125333693) -->

    <skip />

    <!-- no translation found for invalid_hotseat_item (5779907847267573691) -->

    <skip />

    <!-- no translation found for shortcut_installed (1701742129426969556) -->

    <skip />

    <!-- no translation found for shortcut_uninstalled (8176767991305701821) -->

    <skip />

    <!-- no translation found for shortcut_duplicate (9167217446062498127) -->

    <skip />

    <!-- no translation found for title_select_shortcut (6680642571148153868) -->

    <skip />

    <!-- no translation found for title_select_application (3280812711670683644) -->

    <skip />

    <!-- no translation found for all_apps_button_label (9110807029020582876) -->

    <skip />

    <!-- no translation found for all_apps_home_button_label (252062713717058851) -->

    <skip />

    <!-- no translation found for delete_zone_label_workspace (4009607676751398685) -->

    <skip />

    <!-- no translation found for delete_zone_label_all_apps (8083826390278958980) -->

    <skip />

    <!-- no translation found for delete_target_label (1822697352535677073) -->

    <skip />

    <!-- no translation found for delete_target_uninstall_label (5100785476250872595) -->

    <skip />

    <!-- no translation found for info_target_label (8053346143994679532) -->

    <skip />

    <!-- no translation found for accessibility_search_button (1628520399424565142) -->

    <skip />

    <!-- no translation found for accessibility_voice_search_button (4637324840434406584) -->

    <skip />

    <!-- no translation found for accessibility_all_apps_button (2603132375383800483) -->

    <skip />

    <!-- no translation found for accessibility_delete_button (6466114477993744621) -->

    <skip />

    <!-- no translation found for delete_zone_label_all_apps_system_app (449755632749610895) -->

    <skip />

    <!-- no translation found for cab_menu_delete_app (7435191475867183689) -->

    <skip />

    <!-- no translation found for cab_menu_app_info (8593722221450362342) -->

    <skip />

    <!-- no translation found for cab_app_selection_text (374688303047985416) -->

    <skip />

    <!-- no translation found for cab_widget_selection_text (1833458597831541241) -->

    <skip />

    <!-- no translation found for cab_folder_selection_text (7999992513806132118) -->

    <skip />

    <!-- no translation found for cab_shortcut_selection_text (2103811025667946450) -->

    <skip />

    <!-- no translation found for permlab_install_shortcut (5632423390354674437) -->

    <skip />

    <!-- no translation found for permdesc_install_shortcut (923466509822011139) -->

    <skip />

    <!-- no translation found for permlab_uninstall_shortcut (864595034498083837) -->

    <skip />

    <!-- no translation found for permdesc_uninstall_shortcut (5134129545001836849) -->

    <skip />

    <!-- no translation found for permlab_read_settings (1941457408239617576) -->

    <skip />

    <!-- no translation found for permdesc_read_settings (5833423719057558387) -->

    <skip />

    <!-- no translation found for permlab_write_settings (3574213698004620587) -->

    <skip />

    <!-- no translation found for permdesc_write_settings (5440712911516509985) -->

    <skip />

    <!-- no translation found for gadget_error_text (6081085226050792095) -->

    <skip />

    <!-- no translation found for uninstall_system_app_text (4172046090762920660) -->

    <skip />

    <!-- no translation found for dream_name (1530253749244328964) -->

    <skip />

    <!-- no translation found for folder_hint_text (6617836969016293992) -->

    <skip />

    <!-- no translation found for workspace_description_format (2950174241104043327) -->

    <skip />

    <!-- no translation found for default_scroll_format (7475544710230993317) -->

    <skip />

    <!-- no translation found for workspace_scroll_format (8458889198184077399) -->

    <skip />

    <!-- no translation found for apps_customize_apps_scroll_format (370005296147130238) -->

    <skip />

    <!-- no translation found for apps_customize_widgets_scroll_format (3106209519974971521) -->

    <skip />

    <!-- no translation found for first_run_cling_title (2459738000155917941) -->

    <skip />

    <!-- no translation found for first_run_cling_description (6447072552696253358) -->

    <skip />

    <!-- no translation found for first_run_cling_create_screens_hint (6950729526680114157) -->

    <skip />

    <!-- no translation found for migration_cling_title (9181776667882933767) -->

    <skip />

    <!-- no translation found for migration_cling_description (2752413805582227644) -->

    <skip />

    <!-- no translation found for migration_cling_copy_apps (946331230090919440) -->

    <skip />

    <!-- no translation found for migration_cling_use_default (2626475813981258626) -->

    <skip />

    <!-- no translation found for workspace_cling_title (5626202359865825661) -->

    <skip />

    <!-- no translation found for workspace_cling_move_item (528201129978005352) -->

    <skip />

    <!-- no translation found for folder_cling_title (3894908818693254164) -->

    <skip />

    <!-- no translation found for folder_cling_create_folder (6158215559475836131) -->

    <skip />

    <!-- no translation found for cling_dismiss (8962359497601507581) -->

    <skip />

    <!-- no translation found for folder_opened (94695026776264709) -->

    <skip />

    <!-- no translation found for folder_tap_to_close (1884479294466410023) -->

    <skip />

    <!-- no translation found for folder_tap_to_rename (9191075570492871147) -->

    <skip />

    <!-- no translation found for folder_closed (4100806530910930934) -->

    <skip />

    <!-- no translation found for folder_renamed (1794088362165669656) -->

    <skip />

    <!-- no translation found for folder_name_format (6629239338071103179) -->

    <skip />

    <!-- no translation found for widget_button_text (2880537293434387943) -->

    <skip />

    <!-- no translation found for wallpaper_button_text (8404103075899945851) -->

    <skip />

    <!-- no translation found for settings_button_text (8119458837558863227) -->

    <skip />

    <!-- no translation found for package_state_enqueued (6227252464303085641) -->

    <skip />

    <!-- no translation found for package_state_downloading (4088770468458724721) -->

    <skip />

    <!-- no translation found for package_state_installing (7588193972189849870) -->

    <skip />

    <!-- no translation found for package_state_unknown (7592128424511031410) -->

    <skip />

    <!-- no translation found for package_state_error (7672093962724223588) -->

    <skip />

</resources>

res/values/strings.xml

+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>