From c5c7da9a8b622ab6f891e4a4d8b270fb0bc314ce Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 2 Aug 2022 13:36:54 -0700 Subject: [PATCH 01/10] Removing some obsolete features PROMISE_APPS_NEW_INSTALLS = true ENABLE_QUICKSTEP_WIDGET_APP_START = true FOLDER_NAME_SUGGEST = true ENABLE_PREDICTION_DISMISS = true HOTSEAT_MIGRATE_TO_FOLDER = false ENABLE_DEEP_SHORTCUT_ICON_CACHE = true ENABLE_THEMED_ICONS = true ENABLE_ALL_APPS_EDU = true EXPANDED_SMARTSPACE = false Bug: 241141733 Test: Presubmit Change-Id: I72c0c20ab7e214994dc3c3665c90e85d45991a7a --- quickstep/res/values/strings.xml | 1 - .../hybridhotseat/HotseatEduController.java | 96 +------------------ .../hybridhotseat/HotseatEduDialog.java | 10 +- .../uioverrides/QuickstepLauncher.java | 5 +- .../NavBarToHomeTouchController.java | 3 +- .../logging/SettingsChangeLogger.java | 9 +- .../util/QuickstepOnboardingPrefs.java | 4 +- src/com/android/launcher3/DropTarget.java | 8 +- .../android/launcher3/LauncherAppState.java | 11 +-- src/com/android/launcher3/LauncherModel.java | 3 - .../launcher3/SecondaryDropTarget.java | 2 +- src/com/android/launcher3/Workspace.java | 8 +- .../launcher3/config/FeatureFlags.java | 33 ------- src/com/android/launcher3/folder/Folder.java | 7 +- .../android/launcher3/folder/FolderIcon.java | 29 ++---- .../graphics/GridCustomizationsProvider.java | 9 +- .../android/launcher3/icons/IconCache.java | 11 +-- .../launcher3/icons/ShortcutCachingLogic.java | 3 +- .../android/launcher3/model/LoaderCursor.java | 2 +- .../android/launcher3/model/LoaderTask.java | 24 ++--- .../launcher3/model/data/FolderInfo.java | 7 -- .../launcher3/pm/InstallSessionHelper.java | 4 +- .../ShortcutDragPreviewProvider.java | 36 ++----- src/com/android/launcher3/util/Themes.java | 4 +- 24 files changed, 51 insertions(+), 278 deletions(-) diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index 81b0dd297c..c0d52a42bd 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -68,7 +68,6 @@ 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. Get app suggestions diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java index d63bc18a33..048243e345 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduController.java @@ -26,22 +26,17 @@ import android.view.View; import com.android.launcher3.BubbleTextView; import com.android.launcher3.CellLayout; import com.android.launcher3.Hotseat; -import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherSettings; import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; -import com.android.launcher3.config.FeatureFlags; -import com.android.launcher3.model.data.FolderInfo; import com.android.launcher3.model.data.ItemInfo; import com.android.launcher3.model.data.WorkspaceItemInfo; -import com.android.launcher3.util.GridOccupancy; import com.android.launcher3.util.IntArray; import com.android.launcher3.views.ArrowTipView; import com.android.launcher3.views.Snackbar; -import java.util.ArrayDeque; import java.util.ArrayList; import java.util.List; import java.util.stream.IntStream; @@ -74,101 +69,12 @@ public class HotseatEduController { */ void migrate() { HotseatRestoreHelper.createBackup(mLauncher); - if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) { - migrateToFolder(); - } else { - migrateHotseatWhole(); - } + migrateHotseatWhole(); Snackbar.show(mLauncher, R.string.hotsaet_tip_prediction_enabled, R.string.hotseat_prediction_settings, null, () -> mLauncher.startActivity(getSettingsIntent())); } - /** - * This migration places all non folder items in the hotseat into a folder and then moves - * all folders in the hotseat to a workspace page that has enough empty spots. - * - * @return pageId that has accepted the items. - */ - private int migrateToFolder() { - ArrayDeque folders = new ArrayDeque<>(); - ArrayList putIntoFolder = new ArrayList<>(); - - //separate folders and items that can get in folders - for (int i = 0; i < mLauncher.getDeviceProfile().numShownHotseatIcons; i++) { - View view = mHotseat.getChildAt(i, 0); - if (view == null) continue; - ItemInfo info = (ItemInfo) view.getTag(); - if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_FOLDER) { - folders.add((FolderInfo) info); - } else if (info instanceof WorkspaceItemInfo && info.container == LauncherSettings - .Favorites.CONTAINER_HOTSEAT) { - putIntoFolder.add((WorkspaceItemInfo) info); - } - } - - // create a temp folder and add non folder items to it - if (!putIntoFolder.isEmpty()) { - ItemInfo firstItem = putIntoFolder.get(0); - FolderInfo folderInfo = new FolderInfo(); - mLauncher.getModelWriter().addItemToDatabase(folderInfo, firstItem.container, - firstItem.screenId, firstItem.cellX, firstItem.cellY); - folderInfo.setTitle("", mLauncher.getModelWriter()); - folderInfo.contents.addAll(putIntoFolder); - for (int i = 0; i < folderInfo.contents.size(); i++) { - ItemInfo item = folderInfo.contents.get(i); - item.rank = i; - mLauncher.getModelWriter().moveItemInDatabase(item, folderInfo.id, 0, - item.cellX, item.cellY); - } - folders.add(folderInfo); - } - mNewItems.addAll(folders); - - return placeFoldersInWorkspace(folders); - } - - private int placeFoldersInWorkspace(ArrayDeque folders) { - if (folders.isEmpty()) return 0; - - Workspace workspace = mLauncher.getWorkspace(); - InvariantDeviceProfile idp = mLauncher.getDeviceProfile().inv; - - GridOccupancy[] occupancyList = new GridOccupancy[workspace.getChildCount()]; - for (int i = 0; i < occupancyList.length; i++) { - occupancyList[i] = ((CellLayout) workspace.getChildAt(i)).cloneGridOccupancy(); - } - //scan every screen to find available spots to place folders - int occupancyIndex = 0; - int[] itemXY = new int[2]; - while (occupancyIndex < occupancyList.length && !folders.isEmpty()) { - GridOccupancy occupancy = occupancyList[occupancyIndex]; - if (occupancy.findVacantCell(itemXY, 1, 1)) { - FolderInfo info = folders.poll(); - mLauncher.getModelWriter().moveItemInDatabase(info, - LauncherSettings.Favorites.CONTAINER_DESKTOP, - workspace.getScreenIdForPageIndex(occupancyIndex), itemXY[0], itemXY[1]); - occupancy.markCells(info, true); - } else { - occupancyIndex++; - } - } - if (folders.isEmpty()) return workspace.getScreenIdForPageIndex(occupancyIndex); - int screenId = LauncherSettings.Settings.call(mLauncher.getContentResolver(), - LauncherSettings.Settings.METHOD_NEW_SCREEN_ID) - .getInt(LauncherSettings.Settings.EXTRA_VALUE); - // if all screens are full and we still have folders left, put those on a new page - FolderInfo folderInfo; - int col = 0; - while ((folderInfo = folders.poll()) != null) { - mLauncher.getModelWriter().moveItemInDatabase(folderInfo, - LauncherSettings.Favorites.CONTAINER_DESKTOP, screenId, col++, - idp.numRows - 1); - } - mNewScreens = IntArray.wrap(screenId); - return workspace.getPageCount(); - } - /** * This migration option attempts to move the entire hotseat up to the first workspace that * has space to host items. If no such page is found, it moves items to a new page. diff --git a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java index 7b48332e84..21008344f7 100644 --- a/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java +++ b/quickstep/src/com/android/launcher3/hybridhotseat/HotseatEduDialog.java @@ -15,8 +15,7 @@ */ package com.android.launcher3.hybridhotseat; -import static com.android.launcher3.logging.StatsLogManager.LauncherEvent - .LAUNCHER_HOTSEAT_EDU_ACCEPT; +import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_ACCEPT; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_DENY; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOTSEAT_EDU_SEEN; @@ -39,7 +38,6 @@ import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.anim.Interpolators; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.model.data.WorkspaceItemInfo; import com.android.launcher3.uioverrides.PredictedAppIcon; import com.android.launcher3.views.AbstractSlideInView; @@ -112,12 +110,6 @@ public class HotseatEduDialog extends AbstractSlideInView implements I ((LinearLayout.LayoutParams) buttonContainer.getLayoutParams()).setMarginEnd( adjustedMarginEnd); } - - // update ui to reflect which migration method is going to be used - if (FeatureFlags.HOTSEAT_MIGRATE_TO_FOLDER.get()) { - ((TextView) findViewById(R.id.hotseat_edu_content)).setText( - R.string.hotseat_edu_message_migrate_alt); - } } private void onAccept(View v) { diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java index 21f03be517..951226cd1a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java +++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java @@ -26,7 +26,6 @@ import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; import static com.android.launcher3.LauncherState.OVERVIEW_MODAL_TASK; import static com.android.launcher3.compat.AccessibilityManagerCompat.sendCustomAccessibilityEvent; -import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_WIDGET_APP_START; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_APP_LAUNCH_TAP; import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_ORDINAL; import static com.android.launcher3.testing.shared.TestProtocol.HINT_STATE_TWO_BUTTON_ORDINAL; @@ -339,9 +338,7 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { protected LauncherAppWidgetHost createAppWidgetHost() { LauncherAppWidgetHost appWidgetHost = super.createAppWidgetHost(); - if (ENABLE_QUICKSTEP_WIDGET_APP_START.get()) { - appWidgetHost.setInteractionHandler(new QuickstepInteractionHandler(this)); - } + appWidgetHost.setInteractionHandler(new QuickstepInteractionHandler(this)); return appWidgetHost; } diff --git a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java index 34a6821ac5..30bb892c9a 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/NavBarToHomeTouchController.java @@ -25,7 +25,6 @@ import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PULL_BACK_TRANSLATION; import static com.android.launcher3.anim.AnimatorListeners.forSuccessCallback; import static com.android.launcher3.anim.Interpolators.DEACCEL_3; -import static com.android.launcher3.config.FeatureFlags.ENABLE_ALL_APPS_EDU; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; import static com.android.launcher3.logging.StatsLogManager.LauncherEvent.LAUNCHER_HOME_GESTURE; import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS; @@ -106,7 +105,7 @@ public class NavBarToHomeTouchController implements TouchController, if (mStartState.overviewUi || mStartState == ALL_APPS) { return true; } - int typeToClose = ENABLE_ALL_APPS_EDU.get() ? TYPE_ALL & ~TYPE_ALL_APPS_EDU : TYPE_ALL; + int typeToClose = TYPE_ALL & ~TYPE_ALL_APPS_EDU; if (AbstractFloatingView.getTopOpenViewWithType(mLauncher, typeToClose) != null) { return true; } diff --git a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java index bd0250d27d..99553e819e 100644 --- a/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java +++ b/quickstep/src/com/android/quickstep/logging/SettingsChangeLogger.java @@ -40,7 +40,6 @@ import android.util.Xml; import com.android.launcher3.AutoInstallsLayout; import com.android.launcher3.R; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.logging.InstanceId; import com.android.launcher3.logging.StatsLogManager; import com.android.launcher3.logging.StatsLogManager.StatsLogger; @@ -179,11 +178,9 @@ public class SettingsChangeLogger implements logger::log); SharedPreferences prefs = getPrefs(mContext); - if (FeatureFlags.ENABLE_THEMED_ICONS.get()) { - logger.log(prefs.getBoolean(KEY_THEMED_ICONS, false) - ? LAUNCHER_THEMED_ICON_ENABLED - : LAUNCHER_THEMED_ICON_DISABLED); - } + logger.log(prefs.getBoolean(KEY_THEMED_ICONS, false) + ? LAUNCHER_THEMED_ICON_ENABLED + : LAUNCHER_THEMED_ICON_DISABLED); mLoggablePrefs.forEach((key, lp) -> logger.log(() -> prefs.getBoolean(key, lp.defaultValue) ? lp.eventIdOn : lp.eventIdOff)); diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java index fb32581508..fc44b99a4d 100644 --- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java +++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java @@ -29,7 +29,6 @@ import com.android.launcher3.LauncherState; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.appprediction.AppsDividerView; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.hybridhotseat.HotseatPredictionController; import com.android.launcher3.statemanager.StateManager; import com.android.launcher3.statemanager.StateManager.StateListener; @@ -88,8 +87,7 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs }); } - if (DisplayController.getNavigationMode(launcher) == NO_BUTTON - && FeatureFlags.ENABLE_ALL_APPS_EDU.get()) { + if (DisplayController.getNavigationMode(launcher) == NO_BUTTON) { stateManager.addStateListener(new StateListener() { private static final int MAX_NUM_SWIPES_TO_TRIGGER_EDU = 3; diff --git a/src/com/android/launcher3/DropTarget.java b/src/com/android/launcher3/DropTarget.java index 70d84760fc..2d995103e7 100644 --- a/src/com/android/launcher3/DropTarget.java +++ b/src/com/android/launcher3/DropTarget.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.Rect; import com.android.launcher3.accessibility.DragViewStateAnnouncer; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.dragndrop.DraggableView; @@ -82,11 +81,8 @@ public interface DropTarget { public final InstanceId logInstanceId = new InstanceIdSequence().newInstanceId(); public DragObject(Context context) { - if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - Executors.MODEL_EXECUTOR.post(() -> { - folderNameProvider = FolderNameProvider.newInstance(context); - }); - } + Executors.MODEL_EXECUTOR.post(() -> + folderNameProvider = FolderNameProvider.newInstance(context)); } /** diff --git a/src/com/android/launcher3/LauncherAppState.java b/src/com/android/launcher3/LauncherAppState.java index 597bc8da3a..ea3f723e29 100644 --- a/src/com/android/launcher3/LauncherAppState.java +++ b/src/com/android/launcher3/LauncherAppState.java @@ -19,7 +19,6 @@ package com.android.launcher3; import static android.app.admin.DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED; import static com.android.launcher3.Utilities.getDevicePrefs; -import static com.android.launcher3.config.FeatureFlags.ENABLE_THEMED_ICONS; import static com.android.launcher3.util.Executors.MODEL_EXECUTOR; import static com.android.launcher3.util.SettingsCache.NOTIFICATION_BADGING_URI; @@ -118,12 +117,10 @@ public class LauncherAppState implements SafeCloseable { observer, MODEL_EXECUTOR.getHandler()); mOnTerminateCallback.add(iconChangeTracker::close); MODEL_EXECUTOR.execute(observer::verifyIconChanged); - if (ENABLE_THEMED_ICONS.get()) { - SharedPreferences prefs = Utilities.getPrefs(mContext); - prefs.registerOnSharedPreferenceChangeListener(observer); - mOnTerminateCallback.add( - () -> prefs.unregisterOnSharedPreferenceChangeListener(observer)); - } + SharedPreferences prefs = Utilities.getPrefs(mContext); + prefs.registerOnSharedPreferenceChangeListener(observer); + mOnTerminateCallback.add( + () -> prefs.unregisterOnSharedPreferenceChangeListener(observer)); InstallSessionTracker installSessionTracker = InstallSessionHelper.INSTANCE.get(context).registerInstallTracker(mModel); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index f7907890ef..68b77011f2 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -457,9 +457,6 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi @Override public void onSessionFailure(String packageName, UserHandle user) { - if (!FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get()) { - return; - } enqueueModelUpdateTask(new BaseModelUpdateTask() { @Override public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) { diff --git a/src/com/android/launcher3/SecondaryDropTarget.java b/src/com/android/launcher3/SecondaryDropTarget.java index f8bc1f4e6e..0ee7aae088 100644 --- a/src/com/android/launcher3/SecondaryDropTarget.java +++ b/src/com/android/launcher3/SecondaryDropTarget.java @@ -159,7 +159,7 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList return RECONFIGURE; } return INVALID; - } else if (FeatureFlags.ENABLE_PREDICTION_DISMISS.get() && info.isPredictedItem()) { + } else if (info.isPredictedItem()) { return DISMISS_PREDICTION; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index e025790ca2..196ee34396 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -152,10 +152,6 @@ public class Workspace extends PagedView public static final int DEFAULT_PAGE = 0; - private static final int DEFAULT_SMARTSPACE_HEIGHT = 1; - - private static final int EXPANDED_SMARTSPACE_HEIGHT = 2; - private LayoutTransition mLayoutTransition; @Thunk final WallpaperManager mWallpaperManager; @@ -561,10 +557,8 @@ public class Workspace extends PagedView .inflate(R.layout.search_container_workspace, firstPage, false); } - int cellVSpan = FeatureFlags.EXPANDED_SMARTSPACE.get() - ? EXPANDED_SMARTSPACE_HEIGHT : DEFAULT_SMARTSPACE_HEIGHT; int cellHSpan = mLauncher.getDeviceProfile().inv.numSearchContainerColumns; - CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, cellHSpan, cellVSpan); + CellLayout.LayoutParams lp = new CellLayout.LayoutParams(0, 0, cellHSpan, 1); lp.canReorder = false; if (!firstPage.addViewToCellLayout(mQsb, 0, R.id.search_container_workspace, lp, true)) { Log.e(TAG, "Failed to add to item at (0, 0) to CellLayout"); diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 4fd13b2b39..2c0934bb45 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -67,11 +67,6 @@ public final class FeatureFlags { public static final BooleanFlag PROMISE_APPS_IN_ALL_APPS = getDebugFlag( "PROMISE_APPS_IN_ALL_APPS", false, "Add promise icon in all-apps"); - // When enabled a promise icon is added to the home screen when install session is active. - public static final BooleanFlag PROMISE_APPS_NEW_INSTALLS = getDebugFlag( - "PROMISE_APPS_NEW_INSTALLS", true, - "Adds a promise icon to the home screen for new install sessions."); - // TODO: b/206508141: Long pressing on some icons on home screen cause launcher to crash. public static final BooleanFlag ENABLE_LOCAL_COLOR_POPUPS = getDebugFlag( "ENABLE_LOCAL_COLOR_POPUPS", false, "Enable local color extraction for popups."); @@ -82,10 +77,6 @@ public final class FeatureFlags { public static final BooleanFlag ENABLE_QUICKSTEP_LIVE_TILE = getDebugFlag( "ENABLE_QUICKSTEP_LIVE_TILE", true, "Enable live tile in Quickstep overview"); - public static final BooleanFlag ENABLE_QUICKSTEP_WIDGET_APP_START = getDebugFlag( - "ENABLE_QUICKSTEP_WIDGET_APP_START", true, - "Enable Quickstep animation when launching activities from an app widget"); - public static final BooleanFlag ENABLE_DEVICE_SEARCH = new DeviceFlag( "ENABLE_DEVICE_SEARCH", true, "Allows on device search in all apps"); @@ -116,30 +107,14 @@ public final class FeatureFlags { "ENABLE_PEOPLE_TILE_PREVIEW", false, "Experimental: Shows conversation shortcuts on home screen as search results"); - public static final BooleanFlag FOLDER_NAME_SUGGEST = new DeviceFlag( - "FOLDER_NAME_SUGGEST", true, - "Suggests folder names instead of blank text."); - public static final BooleanFlag FOLDER_NAME_MAJORITY_RANKING = getDebugFlag( "FOLDER_NAME_MAJORITY_RANKING", true, "Suggests folder names based on majority based ranking."); - public static final BooleanFlag ENABLE_PREDICTION_DISMISS = getDebugFlag( - "ENABLE_PREDICTION_DISMISS", true, "Allow option to dimiss apps from predicted list"); - public static final BooleanFlag ASSISTANT_GIVES_LAUNCHER_FOCUS = getDebugFlag( "ASSISTANT_GIVES_LAUNCHER_FOCUS", false, "Allow Launcher to handle nav bar gestures while Assistant is running over it"); - public static final BooleanFlag HOTSEAT_MIGRATE_TO_FOLDER = getDebugFlag( - "HOTSEAT_MIGRATE_TO_FOLDER", false, "Should move hotseat items into a folder"); - - public static final BooleanFlag ENABLE_DEEP_SHORTCUT_ICON_CACHE = getDebugFlag( - "ENABLE_DEEP_SHORTCUT_ICON_CACHE", true, "R/W deep shortcut in IconCache"); - - public static final BooleanFlag ENABLE_THEMED_ICONS = getDebugFlag( - "ENABLE_THEMED_ICONS", true, "Enable themed icons on workspace"); - public static final BooleanFlag ENABLE_BULK_WORKSPACE_ICON_LOADING = getDebugFlag( "ENABLE_BULK_WORKSPACE_ICON_LOADING", true, @@ -174,10 +149,6 @@ public final class FeatureFlags { "ALWAYS_USE_HARDWARE_OPTIMIZATION_FOR_FOLDER_ANIMATIONS", false, "Always use hardware optimization for folder animations."); - public static final BooleanFlag ENABLE_ALL_APPS_EDU = getDebugFlag( - "ENABLE_ALL_APPS_EDU", true, - "Shows user a tutorial on how to get to All Apps after X amount of attempts."); - public static final BooleanFlag SEPARATE_RECENTS_ACTIVITY = getDebugFlag( "SEPARATE_RECENTS_ACTIVITY", false, "Uses a separate recents activity instead of using the integrated recents+Launcher UI"); @@ -186,10 +157,6 @@ public final class FeatureFlags { "ENABLE_MINIMAL_DEVICE", false, "Allow user to toggle minimal device mode in launcher."); - public static final BooleanFlag EXPANDED_SMARTSPACE = new DeviceFlag( - "EXPANDED_SMARTSPACE", false, "Expands smartspace height to two rows. " - + "Any apps occupying the first row will be removed from workspace."); - // TODO: b/172467144 Remove ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE feature flag. public static final BooleanFlag ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE = new DeviceFlag( "ENABLE_LAUNCHER_ACTIVITY_THEME_CROSSFADE", false, "Enables a " diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/folder/Folder.java index e68ebdb6e5..7e1491287f 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/folder/Folder.java @@ -368,9 +368,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo public void startEditingFolderName() { post(() -> { - if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - showLabelSuggestions(); - } + showLabelSuggestions(); mFolderName.setHint(""); mIsEditingName = true; }); @@ -1080,8 +1078,7 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo if (!items.isEmpty()) { mLauncherDelegate.getModelWriter().moveItemsInDatabase(items, mInfo.id, 0); } - if (FeatureFlags.FOLDER_NAME_SUGGEST.get() && !isBind - && total > 1 /* no need to update if there's one icon */) { + if (!isBind && total > 1 /* no need to update if there's one icon */) { Executors.MODEL_EXECUTOR.post(() -> { FolderNameInfos nameInfos = new FolderNameInfos(); FolderNameProvider fnp = FolderNameProvider.newInstance(getContext()); diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java index b1e27019c3..33e090285a 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/folder/FolderIcon.java @@ -57,7 +57,6 @@ import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.allapps.ActivityAllAppsContainerView; import com.android.launcher3.anim.Interpolators; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dot.FolderDotInfo; import com.android.launcher3.dragndrop.BaseItemDragListener; import com.android.launcher3.dragndrop.DragLayer; @@ -418,35 +417,23 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel if (!itemAdded) mPreviewItemManager.hidePreviewItem(index, true); FolderNameInfos nameInfos = new FolderNameInfos(); - if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - Executors.MODEL_EXECUTOR.post(() -> { - d.folderNameProvider.getSuggestedFolderName( - getContext(), mInfo.contents, nameInfos); - showFinalView(finalIndex, item, nameInfos, d.logInstanceId); - }); - } else { - showFinalView(finalIndex, item, nameInfos, d.logInstanceId); - } + Executors.MODEL_EXECUTOR.post(() -> { + d.folderNameProvider.getSuggestedFolderName( + getContext(), mInfo.contents, nameInfos); + postDelayed(() -> { + setLabelSuggestion(nameInfos, d.logInstanceId); + invalidate(); + }, DROP_IN_ANIMATION_DURATION); + }); } else { addItem(item); } } - private void showFinalView(int finalIndex, final WorkspaceItemInfo item, - FolderNameInfos nameInfos, InstanceId instanceId) { - postDelayed(() -> { - setLabelSuggestion(nameInfos, instanceId); - invalidate(); - }, DROP_IN_ANIMATION_DURATION); - } - /** * Set the suggested folder name. */ public void setLabelSuggestion(FolderNameInfos nameInfos, InstanceId instanceId) { - if (!FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - return; - } if (!mInfo.getLabelState().equals(LabelState.UNLABELED)) { return; } diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java index fc8d855801..c28bab51f4 100644 --- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java +++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java @@ -26,7 +26,6 @@ import android.util.Log; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.InvariantDeviceProfile.GridOption; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.Executors; /** @@ -143,11 +142,9 @@ public class GridCustomizationsProvider extends ContentProvider { } case ICON_THEMED: case SET_ICON_THEMED: { - if (FeatureFlags.ENABLE_THEMED_ICONS.get()) { - getPrefs(getContext()).edit() - .putBoolean(KEY_THEMED_ICONS, values.getAsBoolean(BOOLEAN_VALUE)) - .apply(); - } + getPrefs(getContext()).edit() + .putBoolean(KEY_THEMED_ICONS, values.getAsBoolean(BOOLEAN_VALUE)) + .apply(); return 1; } default: diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index fe9b633b66..7621dc206b 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -51,7 +51,6 @@ import androidx.core.util.Pair; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherFiles; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.ComponentWithLabel.ComponentCachingLogic; import com.android.launcher3.icons.cache.BaseIconCache; import com.android.launcher3.icons.cache.CachingLogic; @@ -231,14 +230,8 @@ public class IconCache extends BaseIconCache { */ public void getShortcutIcon(T info, ShortcutInfo si, @NonNull Predicate fallbackIconCheck) { - BitmapInfo bitmapInfo; - if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { - bitmapInfo = cacheLocked(ShortcutKey.fromInfo(si).componentName, si.getUserHandle(), - () -> si, mShortcutCachingLogic, false, false).bitmap; - } else { - // If caching is disabled, load the full icon - bitmapInfo = mShortcutCachingLogic.loadIcon(mContext, si); - } + BitmapInfo bitmapInfo = cacheLocked(ShortcutKey.fromInfo(si).componentName, + si.getUserHandle(), () -> si, mShortcutCachingLogic, false, false).bitmap; if (bitmapInfo.isNullOrLowRes()) { bitmapInfo = getDefaultIcon(si.getUserHandle()); } diff --git a/src/com/android/launcher3/icons/ShortcutCachingLogic.java b/src/com/android/launcher3/icons/ShortcutCachingLogic.java index 6a8f34a93d..1e46344725 100644 --- a/src/com/android/launcher3/icons/ShortcutCachingLogic.java +++ b/src/com/android/launcher3/icons/ShortcutCachingLogic.java @@ -31,7 +31,6 @@ import android.util.Log; import androidx.annotation.NonNull; import com.android.launcher3.LauncherAppState; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.cache.CachingLogic; import com.android.launcher3.shortcuts.ShortcutKey; import com.android.launcher3.util.Themes; @@ -78,7 +77,7 @@ public class ShortcutCachingLogic implements CachingLogic { @Override public long getLastUpdatedTime(ShortcutInfo shortcutInfo, PackageInfo info) { - if (shortcutInfo == null || !FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { + if (shortcutInfo == null) { return info.lastUpdateTime; } return Math.max(shortcutInfo.getLastChangedTimestamp(), info.lastUpdateTime); diff --git a/src/com/android/launcher3/model/LoaderCursor.java b/src/com/android/launcher3/model/LoaderCursor.java index 87e8ebf1bb..6c62b31cbe 100644 --- a/src/com/android/launcher3/model/LoaderCursor.java +++ b/src/com/android/launcher3/model/LoaderCursor.java @@ -465,7 +465,7 @@ public class LoaderCursor extends CursorWrapper { // occupied (if the feature is enabled) in order to account for the search // container. int spanX = mIDP.numSearchContainerColumns; - int spanY = FeatureFlags.EXPANDED_SMARTSPACE.get() ? 2 : 1; + int spanY = 1; screen.markCells(0, 0, spanX, spanY, true); } occupied.put(item.screenId, screen); diff --git a/src/com/android/launcher3/model/LoaderTask.java b/src/com/android/launcher3/model/LoaderTask.java index f1c5d59fc8..b644b6b408 100644 --- a/src/com/android/launcher3/model/LoaderTask.java +++ b/src/com/android/launcher3/model/LoaderTask.java @@ -256,12 +256,10 @@ public class LoaderTask implements Runnable { mApp.getModel()::onPackageIconsUpdated); logASplit(logger, "update icon cache"); - if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { - verifyNotStopped(); - logASplit(logger, "save shortcuts in icon cache"); - updateHandler.updateIcons(allShortcuts, new ShortcutCachingLogic(), - mApp.getModel()::onPackageIconsUpdated); - } + verifyNotStopped(); + logASplit(logger, "save shortcuts in icon cache"); + updateHandler.updateIcons(allShortcuts, new ShortcutCachingLogic(), + mApp.getModel()::onPackageIconsUpdated); // Take a break waitForIdle(); @@ -276,12 +274,10 @@ public class LoaderTask implements Runnable { mResults.bindDeepShortcuts(); logASplit(logger, "bindDeepShortcuts"); - if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { - verifyNotStopped(); - logASplit(logger, "save deep shortcuts in icon cache"); - updateHandler.updateIcons(allDeepShortcuts, - new ShortcutCachingLogic(), (pkgs, user) -> { }); - } + verifyNotStopped(); + logASplit(logger, "save deep shortcuts in icon cache"); + updateHandler.updateIcons(allDeepShortcuts, + new ShortcutCachingLogic(), (pkgs, user) -> { }); // Take a break waitForIdle(); @@ -304,9 +300,7 @@ public class LoaderTask implements Runnable { logASplit(logger, "save widgets in icon cache"); // fifth step - if (FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - loadFolderNames(); - } + loadFolderNames(); verifyNotStopped(); updateHandler.finish(); diff --git a/src/com/android/launcher3/model/data/FolderInfo.java b/src/com/android/launcher3/model/data/FolderInfo.java index efebce342f..8386adbdca 100644 --- a/src/com/android/launcher3/model/data/FolderInfo.java +++ b/src/com/android/launcher3/model/data/FolderInfo.java @@ -30,7 +30,6 @@ import androidx.annotation.Nullable; import com.android.launcher3.LauncherSettings; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.folder.FolderNameInfos; import com.android.launcher3.logger.LauncherAtom; import com.android.launcher3.logger.LauncherAtom.Attribute; @@ -321,12 +320,6 @@ public class FolderInfo extends ItemInfo { return LauncherAtom.ToState.TO_STATE_UNSPECIFIED; } - if (!FeatureFlags.FOLDER_NAME_SUGGEST.get()) { - return title.length() > 0 - ? LauncherAtom.ToState.TO_CUSTOM_WITH_SUGGESTIONS_DISABLED - : LauncherAtom.ToState.TO_EMPTY_WITH_SUGGESTIONS_DISABLED; - } - // TODO: if suggestedFolderNames is null then it infrastructure issue, not // ranking issue. We should log these appropriately. if (suggestedFolderNames == null || !suggestedFolderNames.hasSuggestions()) { diff --git a/src/com/android/launcher3/pm/InstallSessionHelper.java b/src/com/android/launcher3/pm/InstallSessionHelper.java index 9da6670a83..b695194aee 100644 --- a/src/com/android/launcher3/pm/InstallSessionHelper.java +++ b/src/com/android/launcher3/pm/InstallSessionHelper.java @@ -225,14 +225,12 @@ public class InstallSessionHelper { void tryQueuePromiseAppIcon(PackageInstaller.SessionInfo sessionInfo) { if (TestProtocol.sDebugTracing) { Log.d(TestProtocol.MISSING_PROMISE_ICON, LOG + " tryQueuePromiseAppIcon" - + ", FeatureFlags=" + FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get() + ", SessionCommitReceiveEnabled" + SessionCommitReceiver.isEnabled(mAppContext) + ", verifySessionInfo(sessionInfo)=" + verifySessionInfo(sessionInfo) + ", !promiseIconAdded=" + (sessionInfo != null && !promiseIconAddedForId(sessionInfo.getSessionId()))); } - if (FeatureFlags.PROMISE_APPS_NEW_INSTALLS.get() - && SessionCommitReceiver.isEnabled(mAppContext) + if (SessionCommitReceiver.isEnabled(mAppContext) && verifySessionInfo(sessionInfo) && !promiseIconAddedForId(sessionInfo.getSessionId())) { FileLog.d(LOG, "Adding package name to install queue: " diff --git a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java index c166bfc83a..030673024a 100644 --- a/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java +++ b/src/com/android/launcher3/shortcuts/ShortcutDragPreviewProvider.java @@ -16,7 +16,6 @@ package com.android.launcher3.shortcuts; -import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Point; import android.graphics.Rect; @@ -24,7 +23,6 @@ import android.graphics.drawable.Drawable; import android.view.View; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.DragPreviewProvider; import com.android.launcher3.icons.BitmapRenderer; import com.android.launcher3.icons.FastBitmapDrawable; @@ -44,33 +42,13 @@ public class ShortcutDragPreviewProvider extends DragPreviewProvider { @Override public Drawable createDrawable() { - if (FeatureFlags.ENABLE_DEEP_SHORTCUT_ICON_CACHE.get()) { - int size = ActivityContext.lookupContext(mView.getContext()) - .getDeviceProfile().iconSizePx; - return new FastBitmapDrawable( - BitmapRenderer.createHardwareBitmap( - size + blurSizeOutline, - size + blurSizeOutline, - (c) -> drawDragViewOnBackground(c, size))); - } else { - return new FastBitmapDrawable(createDragBitmapLegacy()); - } - } - - private Bitmap createDragBitmapLegacy() { - Drawable d = mView.getBackground(); - Rect bounds = getDrawableBounds(d); - int size = ActivityContext.lookupContext(mView.getContext()).getDeviceProfile().iconSizePx; - final Bitmap b = Bitmap.createBitmap( - size + blurSizeOutline, - size + blurSizeOutline, - Bitmap.Config.ARGB_8888); - Canvas canvas = new Canvas(b); - canvas.translate(blurSizeOutline / 2, blurSizeOutline / 2); - canvas.scale(((float) size) / bounds.width(), ((float) size) / bounds.height(), 0, 0); - canvas.translate(bounds.left, bounds.top); - d.draw(canvas); - return b; + int size = ActivityContext.lookupContext(mView.getContext()) + .getDeviceProfile().iconSizePx; + return new FastBitmapDrawable( + BitmapRenderer.createHardwareBitmap( + size + blurSizeOutline, + size + blurSizeOutline, + (c) -> drawDragViewOnBackground(c, size))); } private void drawDragViewOnBackground(Canvas canvas, float size) { diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java index 53a584d8de..1728f4d0d2 100644 --- a/src/com/android/launcher3/util/Themes.java +++ b/src/com/android/launcher3/util/Themes.java @@ -32,7 +32,6 @@ import android.util.TypedValue; import com.android.launcher3.R; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.GraphicsUtils; /** @@ -74,8 +73,7 @@ public class Themes { * Returns true if workspace icon theming is enabled */ public static boolean isThemedIconEnabled(Context context) { - return FeatureFlags.ENABLE_THEMED_ICONS.get() - && Utilities.getPrefs(context).getBoolean(KEY_THEMED_ICONS, false); + return Utilities.getPrefs(context).getBoolean(KEY_THEMED_ICONS, false); } public static String getDefaultBodyFont(Context context) { From c9c81ef3202c8a31b08dcd807a02aaa89aa3a105 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Wed, 17 Aug 2022 10:02:27 -0700 Subject: [PATCH 02/10] Compressing view capture data and changing the format to avoid storing duplicate strings Also starting the dump process early to avoid timeouts Bug: 242868825 Test: Verified on web-hv UI tool Change-Id: I9943e41426f820c9ab70d39b9f01896ed060cab4 --- protos/view_capture.proto | 39 ++++---- src/com/android/launcher3/Launcher.java | 20 ++-- .../android/launcher3/util/ViewCapture.java | 93 ++++++++++++++----- 3 files changed, 101 insertions(+), 51 deletions(-) diff --git a/protos/view_capture.proto b/protos/view_capture.proto index 349ff36d15..f363f36820 100644 --- a/protos/view_capture.proto +++ b/protos/view_capture.proto @@ -23,6 +23,7 @@ option java_outer_classname = "ViewCaptureData"; message ExportedData { repeated FrameData frameData = 1; + repeated string classname = 2; } message FrameData { @@ -31,26 +32,28 @@ message FrameData { } message ViewNode { - optional string classname = 1; - optional string id = 2; - optional int32 left = 3; - optional int32 top = 4; - optional int32 width = 5; - optional int32 height = 6; - optional int32 scrollX = 7; - optional int32 scrollY = 8; + optional int32 classname_index = 1; + optional int32 hashcode = 2; - optional float translationX = 9; - optional float translationY = 10; - optional float scaleX = 11 [default = 1]; - optional float scaleY = 12 [default = 1]; - optional float alpha = 13 [default = 1]; + repeated ViewNode children = 3; - optional bool willNotDraw = 14; - optional bool clipChildren = 15; - optional int32 visibility = 16; + optional string id = 4; + optional int32 left = 5; + optional int32 top = 6; + optional int32 width = 7; + optional int32 height = 8; + optional int32 scrollX = 9; + optional int32 scrollY = 10; - repeated ViewNode children = 17; + optional float translationX = 11; + optional float translationY = 12; + optional float scaleX = 13 [default = 1]; + optional float scaleY = 14 [default = 1]; + optional float alpha = 15 [default = 1]; - optional float elevation = 18; + optional bool willNotDraw = 16; + optional bool clipChildren = 17; + optional int32 visibility = 18; + + optional float elevation = 19; } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 761f198dad..4a52d3e6a2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1491,9 +1491,9 @@ public class Launcher extends StatefulActivity if (FeatureFlags.CONTINUOUS_VIEW_TREE_CAPTURE.get()) { View root = getDragLayer().getRootView(); if (mViewCapture != null) { - root.getViewTreeObserver().removeOnDrawListener(mViewCapture); + mViewCapture.detach(); } - mViewCapture = new ViewCapture(root); + mViewCapture = new ViewCapture(getWindow()); mViewCapture.attach(); } } @@ -1501,6 +1501,10 @@ public class Launcher extends StatefulActivity @Override public void onDetachedFromWindow() { super.onDetachedFromWindow(); + if (mViewCapture != null) { + mViewCapture.detach(); + mViewCapture = null; + } mOverlayManager.onDetachedFromWindow(); closeContextMenu(); } @@ -2981,6 +2985,7 @@ public class Launcher extends StatefulActivity */ @Override public void dump(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) { + SafeCloseable viewDump = mViewCapture == null ? null : mViewCapture.beginDump(writer, fd); super.dump(prefix, fd, writer, args); if (args.length > 0 && TextUtils.equals(args[0], "--all")) { @@ -3015,19 +3020,16 @@ public class Launcher extends StatefulActivity writer.println(prefix + "\tmRotationHelper: " + mRotationHelper); writer.println(prefix + "\tmAppWidgetHost.isListening: " + mAppWidgetHost.isListening()); - if (mViewCapture != null) { - writer.print(prefix + "\tmViewCapture: "); - writer.flush(); - mViewCapture.dump(fd); - writer.println(); - } - // Extra logging for general debugging mDragLayer.dump(prefix, writer); mStateManager.dump(prefix, writer); mPopupDataProvider.dump(prefix, writer); mDeviceProfile.dump(this, prefix, writer); + if (viewDump != null) { + viewDump.close(); + } + try { FileLog.flushAll(writer); } catch (Exception e) { diff --git a/src/com/android/launcher3/util/ViewCapture.java b/src/com/android/launcher3/util/ViewCapture.java index 58c8269f97..e368ac3c2b 100644 --- a/src/com/android/launcher3/util/ViewCapture.java +++ b/src/com/android/launcher3/util/ViewCapture.java @@ -15,18 +15,23 @@ */ package com.android.launcher3.util; +import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; +import static java.util.stream.Collectors.toList; + import android.content.res.Resources; import android.os.Handler; import android.os.Message; import android.os.Trace; +import android.text.TextUtils; import android.util.Base64; import android.util.Base64OutputStream; import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.ViewTreeObserver.OnDrawListener; +import android.view.Window; import androidx.annotation.UiThread; import androidx.annotation.WorkerThread; @@ -38,7 +43,10 @@ import com.android.launcher3.view.ViewCaptureData.ViewNode; import java.io.FileDescriptor; import java.io.FileOutputStream; import java.io.OutputStream; +import java.io.PrintWriter; +import java.util.ArrayList; import java.util.concurrent.Future; +import java.util.zip.GZIPOutputStream; /** * Utility class for capturing view data every frame @@ -53,6 +61,7 @@ public class ViewCapture implements OnDrawListener { // Launcher. This allows the first free frames avoid object allocation during view capture. private static final int INIT_POOL_SIZE = 300; + private final Window mWindow; private final View mRoot; private final Resources mResources; @@ -67,11 +76,12 @@ public class ViewCapture implements OnDrawListener { private ViewRef mPool = new ViewRef(); /** - * @param root the root view for the capture data + * @param window the window for the capture data */ - public ViewCapture(View root) { - mRoot = root; - mResources = root.getResources(); + public ViewCapture(Window window) { + mWindow = window; + mRoot = mWindow.getDecorView(); + mResources = mRoot.getResources(); mHandler = new Handler(UI_HELPER_EXECUTOR.getLooper(), this::captureViewPropertiesBg); } @@ -82,6 +92,14 @@ public class ViewCapture implements OnDrawListener { mHandler.post(this::initPool); } + /** + * Removes a previously attached ViewCapture from the root + */ + public void detach() { + mHandler.post(() -> MAIN_EXECUTOR.execute( + () -> mRoot.getViewTreeObserver().removeOnDrawListener(this))); + } + @Override public void onDraw() { Trace.beginSection("view_capture"); @@ -139,7 +157,7 @@ public class ViewCapture implements OnDrawListener { } mNodesBg[mFrameIndexBg] = result; ViewRef end = last; - Executors.MAIN_EXECUTOR.execute(() -> addToPool(start, end)); + MAIN_EXECUTOR.execute(() -> addToPool(start, end)); return true; } @@ -160,7 +178,7 @@ public class ViewCapture implements OnDrawListener { } ViewRef end = current; - Executors.MAIN_EXECUTOR.execute(() -> { + MAIN_EXECUTOR.execute(() -> { addToPool(start, end); if (mRoot.isAttachedToWindow()) { mRoot.getViewTreeObserver().addOnDrawListener(this); @@ -168,38 +186,58 @@ public class ViewCapture implements OnDrawListener { }); } + private String getName() { + String title = mWindow.getAttributes().getTitle().toString(); + return TextUtils.isEmpty(title) ? mWindow.toString() : title; + } + /** - * Creates a proto of all the data captured so far. + * Starts the dump process which is completed on closing the returned object. */ - public void dump(FileDescriptor out) { + public SafeCloseable beginDump(PrintWriter writer, FileDescriptor out) { Future task = UI_HELPER_EXECUTOR.submit(this::dumpToProto); - try (OutputStream os = new FileOutputStream(out)) { - ExportedData data = task.get(); - Base64OutputStream encodedOS = new Base64OutputStream(os, - Base64.NO_CLOSE | Base64.NO_PADDING | Base64.NO_WRAP); - data.writeTo(encodedOS); - encodedOS.close(); - os.flush(); - } catch (Exception e) { - Log.e(TAG, "Error capturing proto", e); - } + + return () -> { + writer.println(); + writer.println(" ContinuousViewCapture:"); + writer.println(" window " + getName() + ":"); + writer.println(" pkg:" + mRoot.getContext().getPackageName()); + writer.print(" data:"); + writer.flush(); + + try (OutputStream os = new FileOutputStream(out)) { + ExportedData data = task.get(); + OutputStream encodedOS = new GZIPOutputStream(new Base64OutputStream(os, + Base64.NO_CLOSE | Base64.NO_PADDING | Base64.NO_WRAP)); + data.writeTo(encodedOS); + encodedOS.close(); + os.flush(); + } catch (Exception e) { + Log.e(TAG, "Error capturing proto", e); + } + writer.println(); + writer.println("--end--"); + }; } @WorkerThread private ExportedData dumpToProto() { ExportedData.Builder dataBuilder = ExportedData.newBuilder(); Resources res = mResources; + ArrayList classList = new ArrayList<>(); int size = (mNodesBg[MEMORY_SIZE - 1] == null) ? mFrameIndexBg + 1 : MEMORY_SIZE; for (int i = size - 1; i >= 0; i--) { int index = (MEMORY_SIZE + mFrameIndexBg - i) % MEMORY_SIZE; ViewNode.Builder nodeBuilder = ViewNode.newBuilder(); - mNodesBg[index].toProto(res, nodeBuilder); + mNodesBg[index].toProto(res, classList, nodeBuilder); dataBuilder.addFrameData(FrameData.newBuilder() .setNode(nodeBuilder) .setTimestamp(mFrameTimesBg[index])); } - return dataBuilder.build(); + return dataBuilder + .addAllClassname(classList.stream().map(Class::getName).collect(toList())) + .build(); } private ViewRef captureViewTree(View view, ViewRef start) { @@ -278,10 +316,10 @@ public class ViewCapture implements OnDrawListener { /** * Converts the data to the proto representation and returns the next property ref * at the end of the iteration. - * @param res * @return */ - public ViewPropertyRef toProto(Resources res, ViewNode.Builder outBuilder) { + public ViewPropertyRef toProto(Resources res, ArrayList classList, + ViewNode.Builder outBuilder) { String resolvedId; if (id >= 0) { try { @@ -292,7 +330,14 @@ public class ViewCapture implements OnDrawListener { } else { resolvedId = "NO_ID"; } - outBuilder.setClassname(clazz.getName() + "@" + hashCode) + int classnameIndex = classList.indexOf(clazz); + if (classnameIndex < 0) { + classnameIndex = classList.size(); + classList.add(clazz); + } + outBuilder + .setClassnameIndex(classnameIndex) + .setHashcode(hashCode) .setId(resolvedId) .setLeft(left) .setTop(top) @@ -311,7 +356,7 @@ public class ViewCapture implements OnDrawListener { ViewPropertyRef result = next; for (int i = 0; (i < childCount) && (result != null); i++) { ViewNode.Builder childBuilder = ViewNode.newBuilder(); - result = result.toProto(res, childBuilder); + result = result.toProto(res, classList, childBuilder); outBuilder.addChildren(childBuilder); } return result; From a1185c5274e3f71ec2041802fba209c2bc8080ea Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:14:59 -0700 Subject: [PATCH 03/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I2a6ffec908adcd335edec9cfdaac7738c1329c91 --- quickstep/res/values-or/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index 6ab7c5efb8..d7246c4a11 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -31,11 +31,11 @@ "ଆଜି %1$s ବାକି ଅଛି" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ" "ଆପଣ ପୂର୍ବାନୁମାନ କରିଥିବା ଆପ୍ସ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ମୁଭ୍ କରିଯିବ।" - "ମୂଳ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ମୁଭ୍ ହେବ।" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ, ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ୍ କରିଯିବ।" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ ହୋଇଯିବ।" + "ହୋମ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ମୁଭ ହୋଇଯିବ।" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ, ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ ହୋଇଯିବ।" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" "ନାହିଁ, ଥାଉ" "ସେଟିଂସ" @@ -57,11 +57,11 @@ "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" - "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" - "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" + "ହୋମକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ କରନ୍ତୁ" + "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" @@ -77,7 +77,7 @@ "ବଢ଼ିଆ!" "ଟ୍ୟୁଟୋରିଆଲ୍ %1$d/%2$d" "ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" + "ହୋମକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ଆପଣ ଆପଣଙ୍କ ଟାବଲେଟ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" @@ -101,7 +101,7 @@ "ପଛକୁ ଫେରନ୍ତୁ" "ବନ୍ଦ କରନ୍ତୁ" "ହୋଇଗଲା" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ଆକ୍ସେସିବିଲିଟୀ" "ପଛକୁ ଫେରନ୍ତୁ" "IME ସ୍ୱିଚର" From 93a2a5bcc4879ed9c5f242b954f6fbafc4af13a5 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:16:21 -0700 Subject: [PATCH 04/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I1e65168784aa0fe89867f03f065ea8d973afd19b --- quickstep/res/values-or/strings.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index 6ab7c5efb8..d7246c4a11 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -31,11 +31,11 @@ "ଆଜି %1$s ବାକି ଅଛି" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ" "ଆପଣ ପୂର୍ବାନୁମାନ କରିଥିବା ଆପ୍ସ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ମୁଭ୍ କରିଯିବ।" - "ମୂଳ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ମୂଳ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ମୁଭ୍ ହେବ।" - "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପଗୁଡ଼ିକୁ, ସିଧା ମୂଳ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ୍ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପଗୁଡ଼ିକ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ୍ କରିଯିବ।" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ତଳ ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନର ପସନ୍ଦର ଧାଡ଼ିରେ ଆପ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ ହୋଇଯିବ।" + "ହୋମ ସ୍କ୍ରିନରେ ହିଁ ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ବଦଳିବ। ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନକୁ ପସନ୍ଦର ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ମୁଭ ହୋଇଯିବ।" + "ଆପଣଙ୍କର ସବୁଠାରୁ ଅଧିକ-ବ୍ୟବହୃତ ଆପ୍ସକୁ, ସିଧା ହୋମ ସ୍କ୍ରିନରେ ସହଜରେ ଆକ୍ସେସ କରନ୍ତୁ। ଆପଣଙ୍କ ରୁଟିନଗୁଡ଼ିକ ଆଧାରରେ ପରାମର୍ଶଗୁଡ଼ିକ ପରିବର୍ତ୍ତିତ ହେବ। ତଳ ଧାଡ଼ିରେ ଥିବା ଆପ୍ସ ଏକ ନୂଆ ଫୋଲ୍ଡରକୁ ମୁଭ ହୋଇଯିବ।" "ଆପ୍ ପରାମର୍ଶଗୁଡ଼ିକ ପାଆନ୍ତୁ" "ନାହିଁ, ଥାଉ" "ସେଟିଂସ" @@ -57,11 +57,11 @@ "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ଛାଡ଼ିବା ପୂର୍ବରୁ ବିରତ କରୁନଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" - "ଆପଣ \'ମୂଳପୃଷ୍ଠାକୁ ଯାଆନ୍ତୁ\' ଜେଶ୍ଚର୍ ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" - "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର୍ ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" - "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ମୂଳସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି। ତା\'ପରେ, ପଛକୁ କିପରି ଫେରିବେ ତାହା ଜାଣନ୍ତୁ।" + "ଆପଣ ହୋମ ଜେଶ୍ଚର ସମ୍ପୂର୍ଣ୍ଣ କରିଛନ୍ତି।" + "ହୋମକୁ ଯିବା ପାଇଁ ସ୍ୱାଇପ କରନ୍ତୁ" + "ଆପଣଙ୍କ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" + "2ଟି ଆଙ୍ଗୁଠିରେ ସ୍କ୍ରିନର ତଳୁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ। ଏହି ଜେଶ୍ଚର ସର୍ବଦା ଆପଣଙ୍କୁ ହୋମ ସ୍କ୍ରିନକୁ ନେଇଥାଏ।" "ଆପଣ ସ୍କ୍ରିନର ତଳ ଧାରରୁ ଉପରକୁ ସ୍ୱାଇପ୍ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" "ୱିଣ୍ଡୋକୁ ରିଲିଜ୍ କରିବା ପୂର୍ବରୁ ଅଧିକ ସମୟ ଧରି ରଖିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ।" "ଆପଣ ସିଧା ଉପରକୁ ସ୍ୱାଇପ୍ କରି ତା\'ପରେ ବିରତ କରୁଥିବା ସୁନିଶ୍ଚିତ କରନ୍ତୁ।" @@ -77,7 +77,7 @@ "ବଢ଼ିଆ!" "ଟ୍ୟୁଟୋରିଆଲ୍ %1$d/%2$d" "ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!" - "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" + "ହୋମକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ଆପଣ ଆପଣଙ୍କ ଟାବଲେଟ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" @@ -101,7 +101,7 @@ "ପଛକୁ ଫେରନ୍ତୁ" "ବନ୍ଦ କରନ୍ତୁ" "ହୋଇଗଲା" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ଆକ୍ସେସିବିଲିଟୀ" "ପଛକୁ ଫେରନ୍ତୁ" "IME ସ୍ୱିଚର" From 3a6e8b09a342eff65eb005f8e473e70e6b3eeb73 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:16:54 -0700 Subject: [PATCH 05/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ib4070acbfaee8ed9e40712f9deb8d04faa75f74e --- go/quickstep/res/values-am/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml index 1bfaf66b99..ed3479783a 100644 --- a/go/quickstep/res/values-am/strings.xml +++ b/go/quickstep/res/values-am/strings.xml @@ -9,12 +9,12 @@ "ይቅር" "ቅንብሮች" "በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ" - "እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" + "እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" "ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ" "ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለማዳመጥ እዚህ መታ ያድርጉ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለመተርጎም እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ" "ይህ መተግበሪያ ሊጋራ አይችልም" From 5e0bb864dd70dd706436a4d1c084c9a9acf8f64c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:17:58 -0700 Subject: [PATCH 06/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I265e8f9874add7a7f8bae8c50b942fec49f3f5d6 --- go/quickstep/res/values-am/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go/quickstep/res/values-am/strings.xml b/go/quickstep/res/values-am/strings.xml index 1bfaf66b99..ed3479783a 100644 --- a/go/quickstep/res/values-am/strings.xml +++ b/go/quickstep/res/values-am/strings.xml @@ -9,12 +9,12 @@ "ይቅር" "ቅንብሮች" "በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ" - "እንደ በማያ ገጽዎ ላይ ያለ ጽሑፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" + "እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" "ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ" "ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለማዳመጥ እዚህ መታ ያድርጉ" - "በዚህ ማያ ገጽ ላይ ጽሑፍ ለመተርጎም እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ" + "በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ" "ይህ መተግበሪያ ሊጋራ አይችልም" From e70eb221abcb551ee683b2fa4a96978df50a9f86 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:18:43 -0700 Subject: [PATCH 07/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ic555055ed443e8c803471f079827e5b72e82f657 --- res/values-af/strings.xml | 2 +- res/values-as/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-fr/strings.xml | 4 ++-- res/values-hi/strings.xml | 10 ++++----- res/values-hy/strings.xml | 2 +- res/values-ja/strings.xml | 4 ++-- res/values-ky/strings.xml | 2 +- res/values-mr/strings.xml | 6 +++--- res/values-my/strings.xml | 4 ++-- res/values-ne/strings.xml | 2 +- res/values-or/strings.xml | 40 +++++++++++++++++------------------ res/values-pa/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 55139b3382..89b62eedb1 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -75,7 +75,7 @@ "Deïnstalleer" "Programinligting" "Installeer" - "Moenie program voorstel nie" + "Moenie voorstel nie" "Vasspeldvoorspelling" "installeer kortpaaie" "Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging." diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index b625aab3f9..0add9ae6af 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -75,7 +75,7 @@ "আনইনষ্টল কৰক" "এপ্‌ সম্পৰ্কীয় তথ্য" "ইনষ্টল কৰক" - "এপৰ পৰামৰ্শ নিদিব" + "পৰামৰ্শ নিদিব" "পূৰ্বানুমান কৰা এপ্‌টো পিন কৰক" "শ্বৰ্টকাট ইনষ্টল কৰিব পাৰে" "ব্য়ৱহাৰকাৰীৰ হস্তক্ষেপ অবিহনেই কোনো এপক শ্বৰ্টকাটবোৰ যোগ কৰাৰ অনুমতি দিয়ে।" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8b3ef2d55a..5c357f7b7e 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -75,7 +75,7 @@ "Odinstalovat" "O aplikaci" "Nainstalovat" - "Aplikaci nenavrhovat" + "Nenavrhovat aplikaci" "Připnout předpověď" "instalace zástupce" "Umožňuje aplikaci přidat zástupce bez zásahu uživatele." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 9b30b1efaf..dc1129ff88 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -158,8 +158,8 @@ "Ignorer" "Fermer" "Notification ignorée" - "Personnelles" - "Professionnelles" + "Personnel" + "Professionnel" "Profil professionnel" "Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir" "OK" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index de6ad1c39e..26c0983e11 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -159,16 +159,16 @@ "बंद करें" "सूचना को खारिज किया गया" "निजी ऐप" - "काम से जुड़े ऐप" + "वर्क ऐप्लिकेशन" "वर्क प्रोफ़ाइल" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" + "वर्क ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोके गए" - "ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" + "वर्क ऐप्लिकेशन रोके गए" + "आपके वर्क ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोकें" + "वर्क ऐप्लिकेशन रोकें" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें" "फ़िल्टर" "अपने फ़ोन में खोजें" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 3b9761ffd4..af0e168e89 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -75,7 +75,7 @@ "Ապատեղադրել" "Հավելվածի մասին" "Տեղադրել" - "Թաքցնել առաջարկը" + "Չառաջարկել" "Ամրացնել առաջարկվող հավելվածը" "Դյուրանցումների տեղադրում" "Հավելվածին թույլ է տալիս ավելացնել դյուրանցումներ՝ առանց օգտագործողի միջամտության:" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index d7cbb07de8..272183d0d4 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -75,7 +75,7 @@ "アンインストール" "アプリ情報" "インストール" - "アプリの候補を表示しない" + "アプリを表示しない" "アプリの候補を固定" "ショートカットのインストール" "ユーザー操作なしでショートカットを追加することをアプリに許可します。" @@ -171,7 +171,7 @@ "仕事用アプリを一時停止" "仕事用アプリを ON にする" "フィルタ" - "スマートフォンの検索" + "スマートフォンを検索" "タブレットを探す" "失敗: %1$s" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index ea4a7d2a85..4a0cd23a16 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -75,7 +75,7 @@ "Чыгарып салуу" "Колдонмо тууралуу" "Орнотуу" - "Колдонмо сунушталбасын" + "Cунушталбасын" "Божомолдонгон колдонмону кадап коюу" "тез чакырмаларды орнотуу" "Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет." diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 06c1da78b2..6829b9edea 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -161,14 +161,14 @@ "वैयक्तिक" "कार्य" "कार्य प्रोफाइल" - "कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" "कार्य ॲप्स थांबवली आहेत" "तुमची कार्य ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" "कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" - "Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" - "Work apps थांबवा" + "कार्य ॲप्स थांबवा" "कार्य ॲप्स सुरू करा" "फिल्टर" "तुमच्या फोनमध्ये शोधा" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index aef6169fe1..d264c31a32 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -75,7 +75,7 @@ "ဖယ်ရှားရန်" "အက်ပ်အချက်အလက်" "ထည့်သွင်းရန်" - "အက်ပ်ကို အကြံမပြုပါနှင့်" + "အက်ပ်အကြံမပြုပါနှင့်" "ခန့်မှန်းချက်ကို ပင်ထိုးရန်" "ဖြတ်လမ်းလင့်ခ်များ ထည့်သွင်းခြင်း" "အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း" @@ -115,7 +115,7 @@ "ဆက်တင်များ ပြောင်းရန်" "အကြောင်းကြားချက် အစက်များ ပြရန်" "တီထွင်သူ ရွေးစရာများ" - "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ရန်" + "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ခြင်း" "အက်ပ်အသစ်များအတွက်" "မသိ" "ဖယ်ရှားရန်" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 4965d78286..0d149a04a1 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -75,7 +75,7 @@ "अनइन्स्टल गर्नुहोस्" "एपसम्बन्धी जानकारी" "स्थापना गर्नुहोस्" - "यो एप सिफारिस नगरियोस्" + "एप सिफारिस नगरियोस्" "सिफारिस गरिएको एप पिन गर्नुहोस्" "सर्टकट स्थापना गर्नेहोस्" "प्रयोगकर्ताको हस्तक्षेप बिना एउटा एपलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 1181de9823..3d2ff6cbae 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -26,7 +26,7 @@ "ନିରାପଦ ମୋଡରେ ଡାଉନଲୋଡ୍‌ ହେଇଥିବା ଆପ୍‌ ଅକ୍ଷମ କରାଗଲା" "ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା" "ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ସ୍କ୍ରିନ‌କୁ ସ୍ପ୍ଲିଟ୍ କରନ୍ତୁ" "ଶୀର୍ଷକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" "ବାମପତକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" @@ -37,9 +37,9 @@ "%1$d × %2$d" "%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ" "%1$s ୱିଜେଟ୍" - "ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" - "%1$sର ୱିଜେଟ୍ ମୂଳସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" + "%1$sର ୱିଜେଟ ହୋମ ସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" "{count,plural, =1{#ଟି ୱିଜେଟ୍}other{#ଟି ୱିଜେଟ୍}}" "{count,plural, =1{#ଟି ସର୍ଟକଟ୍}other{#ଟି ସର୍ଟକଟ୍}}" "%1$s, %2$s" @@ -52,7 +52,7 @@ "ୱାର୍କ" "ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ" "ଉପଯୋଗୀ ସୂଚନା ଆପଣଙ୍କ ପାଖରେ ସହଜରେ ଉପଲବ୍ଧ" - "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" + "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ଟାପ କରନ୍ତୁ" "ବୁଝିଗଲି" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" @@ -65,7 +65,7 @@ "ବିଜ୍ଞପ୍ତି" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।" - "ଏହି ମୂଳସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" + "ଏହି ହୋମ ସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" "ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ" "ଆପ୍‌ ତାଲିକା" "ସନ୍ଧାନ ଫଳାଫଳ" @@ -75,14 +75,14 @@ "ଅନଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ଆପ୍‌ ସୂଚନା" "ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" - "ଆପ୍ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" + "ଆପ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" "ପୂର୍ବାନୁମାନକୁ ପିନ୍ କରନ୍ତୁ" "ସର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ୟୁଜରଙ୍କ ବିନା ହସ୍ତକ୍ଷେପରେ ଶର୍ଟକଟ୍‌ ଯୋଡ଼ିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" "ଫୋନ୍‌ କଲ୍‌ କରିବାକୁ %1$sକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ" "ୱିଜେଟ୍ ଲୋଡ୍ କରାଯାଇପାରିବ ନାହିଁ" "ୱିଜେଟ ସେଟିଂସ" @@ -92,8 +92,8 @@ "%1$s ଅକ୍ଷମ କରାଗଲା" "{count,plural, =1{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}other{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}}" "ମୋଟ %2$dରୁ %1$d ନମ୍ବର ପୃଷ୍ଠା" - "%2$dରୁ %1$d ହୋମ୍‌ ସ୍କ୍ରୀନ୍" - "ନୂଆ ହୋମ୍‌ ସ୍କ୍ରୀନ୍‌ ପୃଷ୍ଠା" + "%2$dରୁ %1$d ହୋମ ସ୍କ୍ରିନ" + "ନୂଆ ହୋମ ସ୍କ୍ରିନ ପେଜ" "%2$d / %1$dର ଫୋଲ୍ଡର ଖୋଲାଗଲା" "ଫୋଲ୍ଡର୍‌ ବନ୍ଦ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" "ନାମ ବଦଳାଇବା ସେଭ୍ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" @@ -105,7 +105,7 @@ "ୱାଲପେପର ଏବଂ ଷ୍ଟାଇଲ" "ହୋମ ସେଟିଂସ" "ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି" - "ମୂଳସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ" "ବିଜ୍ଞପ୍ତି ଡଟ୍ସ" "ଚାଲୁ" @@ -115,7 +115,7 @@ "ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ଡଟ୍‌ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ" "ଡେଭେଲପର ବିକଳ୍ପଗୁଡ଼ିକ" - "ମୂଳସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" "ନୂଆ ଆପ୍‌ ପାଇଁ" "ଅଜଣା" "କାଢ଼ି ଦିଅନ୍ତୁ" @@ -133,7 +133,7 @@ "ୱିଜେଟ୍ ତାଲିକା ବନ୍ଦ ହୋଇଛି" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" "ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ" - "ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" + "ହୋମ ସ୍କ୍ରିନରେ ଆଇଟମ ଯୋଗ କରାଗଲା" "ଆଇଟମକୁ କାଢ଼ି ଦିଆଯାଇଛି" "ପୂର୍ବବତ୍‍" "ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ" @@ -146,7 +146,7 @@ "ଫୋଲ୍ଡରରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" "ଏହି ନାମରେ ଫୋଲ୍ଡର ତିଆରି କରନ୍ତୁ: %1$s" "ଫୋଲ୍ଡର ତିଆରି କରାଗଲା" - "ମୂଳସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" "ଆକାର ବଦଳାନ୍ତୁ" "ଚଉଡ଼ା ବଢ଼ାନ୍ତୁ" "ଉଚ୍ଚତା ବଢ଼ାନ୍ତୁ" @@ -161,14 +161,14 @@ "ବ୍ୟକ୍ତିଗତ" "ୱାର୍କ" "ୱର୍କ ପ୍ରୋଫାଇଲ୍‌" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" "ବୁଝିଗଲି" "ୱାର୍କ ଆପ୍ସ ବିରତ କରାଯାଇଛି" - "ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" + "ଆପଣଙ୍କ ୱାର୍କ ଆପ୍ସ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ କରିପାରିବ ନାହିଁ" "ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି। ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" "ବୁଝିଗଲି" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ" + "ୱାର୍କ ଆପ୍ସ ବିରତ କରନ୍ତୁ" "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ" "ଫିଲ୍ଟର୍" "ଆପଣଙ୍କ ଫୋନରେ ସନ୍ଧାନ କରନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 3df68868a5..e0f213800f 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -168,7 +168,7 @@ "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ। ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ" "ਸਮਝ ਲਿਆ" - "ਕੰਮ ਸੰਬੰਧੀ ਐਪ ਰੋਕੋ" + "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਰੋਕੋ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਚਾਲੂ ਕਰੋ" "ਫਿਲਟਰ" "ਆਪਣਾ ਫ਼ੋਨ ਖੋਜੋ" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 1512754d30..3587f7c1a0 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -168,7 +168,7 @@ "As apps de trabalho estão desativadas. As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização" "As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI" "OK" - "Colocar apps de trabalho em pausa" + "Pausar apps de trabalho" "Ativar apps de trabalho" "Filtrar" "Pesquise no telemóvel" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 8582baf21b..a6608f3d3b 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -115,7 +115,7 @@ "Zmeniť nastavenia" "Zobrazovať bodky upozornení" "Pre vývojárov" - "Pridať ikony aplikácií na plochu" + "Pridávať ikony aplikácií na plochu" "Pri inštalácii novej aplikácie" "Neznáme" "Odstrániť" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 5c89925a7c..8a9cfbe2c0 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -75,7 +75,7 @@ "అన్ఇన్‌స్టాల్ చేయండి" "యాప్ సమాచారం" "ఇన్‌స్టాల్ చేయండి" - "యాప్‌ను సూచించవద్దు" + "యాప్ సూచించకు" "సూచనను పిన్ చేయండి" "షార్ట్‌కట్‌లను ఇన్‌స్టాల్ చేయడం" "వినియోగదారు ప్రమేయం లేకుండా షార్ట్‌కట్‌లను జోడించడానికి యాప్‌ను అనుమతిస్తుంది." diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 07e5796734..9e8a75ec54 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -103,7 +103,7 @@ "โฟลเดอร์: %1$s, อย่างน้อย %2$d รายการ" "วอลเปเปอร์" "วอลเปเปอร์และรูปแบบ" - "การตั้งค่าหน้าแรก" + "การตั้งค่าหน้าจอหลัก" "ปิดใช้โดยผู้ดูแลระบบ" "อนุญาตให้หมุนหน้าจอหลัก" "เมื่อหมุนโทรศัพท์" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 2b43a4db68..f1eaeafe14 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -115,7 +115,7 @@ "Змінити налаштування" "Показувати значки сповіщень" "Параметри розробника" - "Розміщати значки додатків на головний екран" + "Розміщати значки додатків на головному екрані" "Для нових додатків" "Невідомо" "Прибрати" From 113cbbeffe1afa7d50980999338eaf86e009c4be Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Sun, 21 Aug 2022 23:20:10 -0700 Subject: [PATCH 08/10] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I9d3bf93d1a1a54701b206b5c89fabd1de6504b7b --- res/values-af/strings.xml | 2 +- res/values-as/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-fr/strings.xml | 4 ++-- res/values-hi/strings.xml | 10 ++++----- res/values-hy/strings.xml | 2 +- res/values-ja/strings.xml | 4 ++-- res/values-ky/strings.xml | 2 +- res/values-mr/strings.xml | 6 +++--- res/values-my/strings.xml | 4 ++-- res/values-ne/strings.xml | 2 +- res/values-or/strings.xml | 40 +++++++++++++++++------------------ res/values-pa/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 55139b3382..89b62eedb1 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -75,7 +75,7 @@ "Deïnstalleer" "Programinligting" "Installeer" - "Moenie program voorstel nie" + "Moenie voorstel nie" "Vasspeldvoorspelling" "installeer kortpaaie" "Laat \'n program toe om kortpaaie by te voeg sonder gebruikerinmenging." diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index b625aab3f9..0add9ae6af 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -75,7 +75,7 @@ "আনইনষ্টল কৰক" "এপ্‌ সম্পৰ্কীয় তথ্য" "ইনষ্টল কৰক" - "এপৰ পৰামৰ্শ নিদিব" + "পৰামৰ্শ নিদিব" "পূৰ্বানুমান কৰা এপ্‌টো পিন কৰক" "শ্বৰ্টকাট ইনষ্টল কৰিব পাৰে" "ব্য়ৱহাৰকাৰীৰ হস্তক্ষেপ অবিহনেই কোনো এপক শ্বৰ্টকাটবোৰ যোগ কৰাৰ অনুমতি দিয়ে।" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8b3ef2d55a..5c357f7b7e 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -75,7 +75,7 @@ "Odinstalovat" "O aplikaci" "Nainstalovat" - "Aplikaci nenavrhovat" + "Nenavrhovat aplikaci" "Připnout předpověď" "instalace zástupce" "Umožňuje aplikaci přidat zástupce bez zásahu uživatele." diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 9b30b1efaf..dc1129ff88 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -158,8 +158,8 @@ "Ignorer" "Fermer" "Notification ignorée" - "Personnelles" - "Professionnelles" + "Personnel" + "Professionnel" "Profil professionnel" "Les applis professionnelles sont identifiées par un badge et votre administrateur informatique peut les voir" "OK" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index de6ad1c39e..26c0983e11 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -159,16 +159,16 @@ "बंद करें" "सूचना को खारिज किया गया" "निजी ऐप" - "काम से जुड़े ऐप" + "वर्क ऐप्लिकेशन" "वर्क प्रोफ़ाइल" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" + "वर्क ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोके गए" - "ऑफ़िस के काम से जुड़े आपके ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" + "वर्क ऐप्लिकेशन रोके गए" + "आपके वर्क ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बंद हैं. ये ऐप्लिकेशन, आपको सूचनाएं नहीं भेज सकते. साथ ही, आपकी बैटरी का इस्तेमाल या आपकी जगह की जानकारी को ऐक्सेस भी नहीं कर सकते" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन बैज किए गए हैं और आईटी एडमिन को दिख रहे हैं" "ठीक है" - "ऑफ़िस के काम से जुड़े ऐप्लिकेशन रोकें" + "वर्क ऐप्लिकेशन रोकें" "ऑफ़िस के काम से जुड़े ऐप्लिकेशन चालू करें" "फ़िल्टर" "अपने फ़ोन में खोजें" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 3b9761ffd4..af0e168e89 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -75,7 +75,7 @@ "Ապատեղադրել" "Հավելվածի մասին" "Տեղադրել" - "Թաքցնել առաջարկը" + "Չառաջարկել" "Ամրացնել առաջարկվող հավելվածը" "Դյուրանցումների տեղադրում" "Հավելվածին թույլ է տալիս ավելացնել դյուրանցումներ՝ առանց օգտագործողի միջամտության:" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index d7cbb07de8..272183d0d4 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -75,7 +75,7 @@ "アンインストール" "アプリ情報" "インストール" - "アプリの候補を表示しない" + "アプリを表示しない" "アプリの候補を固定" "ショートカットのインストール" "ユーザー操作なしでショートカットを追加することをアプリに許可します。" @@ -171,7 +171,7 @@ "仕事用アプリを一時停止" "仕事用アプリを ON にする" "フィルタ" - "スマートフォンの検索" + "スマートフォンを検索" "タブレットを探す" "失敗: %1$s" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index ea4a7d2a85..4a0cd23a16 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -75,7 +75,7 @@ "Чыгарып салуу" "Колдонмо тууралуу" "Орнотуу" - "Колдонмо сунушталбасын" + "Cунушталбасын" "Божомолдонгон колдонмону кадап коюу" "тез чакырмаларды орнотуу" "Колдонмого колдонуучуга кайрылбастан тез чакырма кошууга уруксат берет." diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 06c1da78b2..6829b9edea 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -161,14 +161,14 @@ "वैयक्तिक" "कार्य" "कार्य प्रोफाइल" - "कामाशी संबंधित ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" "कार्य ॲप्स थांबवली आहेत" "तुमची कार्य ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" "कामाशी संबंधित ॲप्स बंद आहेत. तुमचे कामाशी संबंधित ॲप्स तुम्हाला सूचना पाठवू शकत नाहीत, तुमची बॅटरी वापरू शकत नाहीत किंवा तुमचे स्थान अ‍ॅक्सेस करू शकत नाहीत" - "Work apps ही बॅज केलेली असून तुमच्या IT ॲडमिनला दृश्यमान आहेत" + "कार्य ॲप्स ही बॅज केलेली असून तुमच्या आयटी ॲडमिनला दृश्यमान आहेत" "समजले" - "Work apps थांबवा" + "कार्य ॲप्स थांबवा" "कार्य ॲप्स सुरू करा" "फिल्टर" "तुमच्या फोनमध्ये शोधा" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index aef6169fe1..d264c31a32 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -75,7 +75,7 @@ "ဖယ်ရှားရန်" "အက်ပ်အချက်အလက်" "ထည့်သွင်းရန်" - "အက်ပ်ကို အကြံမပြုပါနှင့်" + "အက်ပ်အကြံမပြုပါနှင့်" "ခန့်မှန်းချက်ကို ပင်ထိုးရန်" "ဖြတ်လမ်းလင့်ခ်များ ထည့်သွင်းခြင်း" "အသုံးပြုသူ လုပ်ဆောင်မှုမရှိပဲ အပ်ပလီကေးရှင်းကို အတိုကောက်မှတ်သားမှုများ ပြုလုပ်ခွင့် ပေးခြင်း" @@ -115,7 +115,7 @@ "ဆက်တင်များ ပြောင်းရန်" "အကြောင်းကြားချက် အစက်များ ပြရန်" "တီထွင်သူ ရွေးစရာများ" - "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ရန်" + "ပင်မစာမျက်နှာတွင် အက်ပ်သင်္ကေတထည့်ခြင်း" "အက်ပ်အသစ်များအတွက်" "မသိ" "ဖယ်ရှားရန်" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 4965d78286..0d149a04a1 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -75,7 +75,7 @@ "अनइन्स्टल गर्नुहोस्" "एपसम्बन्धी जानकारी" "स्थापना गर्नुहोस्" - "यो एप सिफारिस नगरियोस्" + "एप सिफारिस नगरियोस्" "सिफारिस गरिएको एप पिन गर्नुहोस्" "सर्टकट स्थापना गर्नेहोस्" "प्रयोगकर्ताको हस्तक्षेप बिना एउटा एपलाई सर्टकटमा थप्नको लागि अनुमति दिनुहोस्।" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 1181de9823..3d2ff6cbae 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -26,7 +26,7 @@ "ନିରାପଦ ମୋଡରେ ଡାଉନଲୋଡ୍‌ ହେଇଥିବା ଆପ୍‌ ଅକ୍ଷମ କରାଗଲା" "ନିରାପଦ ମୋଡରେ ୱିଜେଟ୍‌ ଅକ୍ଷମ କରାଗଲା" "ଶର୍ଟକଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ" - "ମୂଳପୃଷ୍ଠା" + "ହୋମ" "ସ୍କ୍ରିନ‌କୁ ସ୍ପ୍ଲିଟ୍ କରନ୍ତୁ" "ଶୀର୍ଷକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" "ବାମପତକୁ ସ୍ପ୍ଲିଟ କରନ୍ତୁ" @@ -37,9 +37,9 @@ "%1$d × %2$d" "%1$d ଓସାର ଓ %2$d ଉଚ୍ଚ" "%1$s ୱିଜେଟ୍" - "ମୂଳସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନର ଆଖପାଖରେ ୱିଜେଟକୁ ମୁଭ କରିବା ପାଇଁ ଏହାକୁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" - "%1$sର ୱିଜେଟ୍ ମୂଳସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" + "%1$sର ୱିଜେଟ ହୋମ ସ୍କ୍ରିନରେ ଯୋଡ଼ାଗଲା" "{count,plural, =1{#ଟି ୱିଜେଟ୍}other{#ଟି ୱିଜେଟ୍}}" "{count,plural, =1{#ଟି ସର୍ଟକଟ୍}other{#ଟି ସର୍ଟକଟ୍}}" "%1$s, %2$s" @@ -52,7 +52,7 @@ "ୱାର୍କ" "ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ" "ଉପଯୋଗୀ ସୂଚନା ଆପଣଙ୍କ ପାଖରେ ସହଜରେ ଉପଲବ୍ଧ" - "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ମୂଳସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" + "ଆପ୍ସକୁ ନଖୋଲି ସୂଚନା ପାଇବା ପାଇଁ, ଆପଣ ଆପଣଙ୍କ ହୋମ ସ୍କ୍ରିନରେ ୱିଜେଟଗୁଡ଼ିକୁ ଯୋଗ କରିପାରିବେ" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରିବାକୁ ଟାପ କରନ୍ତୁ" "ବୁଝିଗଲି" "ୱିଜେଟ ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" @@ -65,7 +65,7 @@ "ବିଜ୍ଞପ୍ତି" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ସ୍ପର୍ଶ କରି ଧରି ରଖନ୍ତୁ।" "ଏକ ସର୍ଟକଟକୁ ମୁଭ୍ କରିବା ପାଇଁ ଦୁଇଥର-ଟାପ୍ କରି ଧରି ରଖନ୍ତୁ କିମ୍ବା କଷ୍ଟମ୍ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ବ୍ୟବହାର କରନ୍ତୁ।" - "ଏହି ମୂଳସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" + "ଏହି ହୋମ ସ୍କ୍ରିନରେ ଆଉ ଜାଗା ନାହିଁ" "ମନପସନ୍ଦ ଟ୍ରେରେ ଆଉ କୋଠରୀ ନାହିଁ" "ଆପ୍‌ ତାଲିକା" "ସନ୍ଧାନ ଫଳାଫଳ" @@ -75,14 +75,14 @@ "ଅନଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ଆପ୍‌ ସୂଚନା" "ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" - "ଆପ୍ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" + "ଆପ ପରାମର୍ଶ ଦିଅନ୍ତୁ ନାହିଁ" "ପୂର୍ବାନୁମାନକୁ ପିନ୍ କରନ୍ତୁ" "ସର୍ଟକଟ୍‍ ଇନଷ୍ଟଲ୍‌ କରନ୍ତୁ" "ୟୁଜରଙ୍କ ବିନା ହସ୍ତକ୍ଷେପରେ ଶର୍ଟକଟ୍‌ ଯୋଡ଼ିବାକୁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" - "ମୂଳପୃଷ୍ଠା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" - "ମୂଳପୃଷ୍ଠାରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପଢ଼ିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" + "ହୋମ ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ଲେଖନ୍ତୁ" + "ହୋମରେ ଥିବା ସେଟିଂସ ଏବଂ ସର୍ଟକଟଗୁଡ଼ିକୁ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଆପକୁ ଅନୁମତି ଦିଏ।" "ଫୋନ୍‌ କଲ୍‌ କରିବାକୁ %1$sକୁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ" "ୱିଜେଟ୍ ଲୋଡ୍ କରାଯାଇପାରିବ ନାହିଁ" "ୱିଜେଟ ସେଟିଂସ" @@ -92,8 +92,8 @@ "%1$s ଅକ୍ଷମ କରାଗଲା" "{count,plural, =1{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}other{{app_name}ର #ଟି ବିଜ୍ଞପ୍ତି ଅଛି}}" "ମୋଟ %2$dରୁ %1$d ନମ୍ବର ପୃଷ୍ଠା" - "%2$dରୁ %1$d ହୋମ୍‌ ସ୍କ୍ରୀନ୍" - "ନୂଆ ହୋମ୍‌ ସ୍କ୍ରୀନ୍‌ ପୃଷ୍ଠା" + "%2$dରୁ %1$d ହୋମ ସ୍କ୍ରିନ" + "ନୂଆ ହୋମ ସ୍କ୍ରିନ ପେଜ" "%2$d / %1$dର ଫୋଲ୍ଡର ଖୋଲାଗଲା" "ଫୋଲ୍ଡର୍‌ ବନ୍ଦ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" "ନାମ ବଦଳାଇବା ସେଭ୍ କରିବାକୁ ଟାପ୍‌ କରନ୍ତୁ" @@ -105,7 +105,7 @@ "ୱାଲପେପର ଏବଂ ଷ୍ଟାଇଲ" "ହୋମ ସେଟିଂସ" "ଆପଣଙ୍କ ଆଡମିନଙ୍କ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି" - "ମୂଳସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନ ରୋଟେସନକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ଯେତେବେଳେ ଫୋନକୁ ବୁଲାଯାଇଥାଏ" "ବିଜ୍ଞପ୍ତି ଡଟ୍ସ" "ଚାଲୁ" @@ -115,7 +115,7 @@ "ସେଟିଂସ ପରିବର୍ତ୍ତନ କରନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ଡଟ୍‌ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ" "ଡେଭେଲପର ବିକଳ୍ପଗୁଡ଼ିକ" - "ମୂଳସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନରେ ଆପ ଆଇକନଗୁଡ଼ିକୁ ଯୋଗ କରନ୍ତୁ" "ନୂଆ ଆପ୍‌ ପାଇଁ" "ଅଜଣା" "କାଢ଼ି ଦିଅନ୍ତୁ" @@ -133,7 +133,7 @@ "ୱିଜେଟ୍ ତାଲିକା ବନ୍ଦ ହୋଇଛି" "ହୋମ ସ୍କ୍ରିନରେ ଯୋଗ କରନ୍ତୁ" "ଆଇଟମ୍‌କୁ ଏଠାକୁ ଘୁଞ୍ଚାନ୍ତୁ" - "ହୋମ୍‌ ସ୍କ୍ରୀନରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" + "ହୋମ ସ୍କ୍ରିନରେ ଆଇଟମ ଯୋଗ କରାଗଲା" "ଆଇଟମକୁ କାଢ଼ି ଦିଆଯାଇଛି" "ପୂର୍ବବତ୍‍" "ଆଇଟମ୍‌ ଘୁଞ୍ଚାନ୍ତୁ" @@ -146,7 +146,7 @@ "ଫୋଲ୍ଡରରେ ଆଇଟମ୍‌ ଯୋଡ଼ାଗଲା" "ଏହି ନାମରେ ଫୋଲ୍ଡର ତିଆରି କରନ୍ତୁ: %1$s" "ଫୋଲ୍ଡର ତିଆରି କରାଗଲା" - "ମୂଳସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" + "ହୋମ ସ୍କ୍ରିନକୁ ମୁଭ କରନ୍ତୁ" "ଆକାର ବଦଳାନ୍ତୁ" "ଚଉଡ଼ା ବଢ଼ାନ୍ତୁ" "ଉଚ୍ଚତା ବଢ଼ାନ୍ତୁ" @@ -161,14 +161,14 @@ "ବ୍ୟକ୍ତିଗତ" "ୱାର୍କ" "ୱର୍କ ପ୍ରୋଫାଇଲ୍‌" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ସେଗୁଡ଼ିକ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦୃଶ୍ୟମାନ ହେଉଛି" "ବୁଝିଗଲି" "ୱାର୍କ ଆପ୍ସ ବିରତ କରାଯାଇଛି" - "ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" + "ଆପଣଙ୍କ ୱାର୍କ ଆପ୍ସ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ କରିପାରିବ ନାହିଁ" "ୱାର୍କ ଆପଗୁଡ଼ିକ ବନ୍ଦ ଅଛି। ଆପଣଙ୍କ ୱାର୍କ ଆପଗୁଡ଼ିକ ଆପଣଙ୍କୁ ବିଜ୍ଞପ୍ତି ପଠାଇପାରିବ ନାହିଁ, ଆପଣଙ୍କ ବ୍ୟାଟେରୀକୁ ବ୍ୟବହାର କରିପାରିବ ନାହିଁ କିମ୍ବା ଆପଣଙ୍କର ଲୋକେସନକୁ ଆକ୍ସେସ୍ କରିପାରିବ ନାହିଁ" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" + "ୱାର୍କ ଆପ୍ସ ବ୍ୟାଜ୍ କରାଯାଇଛି ଏବଂ ଆପଣଙ୍କ IT ଆଡମିନଙ୍କୁ ଦେଖାଯାଉଛି" "ବୁଝିଗଲି" - "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ବିରତ କରନ୍ତୁ" + "ୱାର୍କ ଆପ୍ସ ବିରତ କରନ୍ତୁ" "ୱାର୍କ ଆପଗୁଡ଼ିକୁ ଚାଲୁ କରନ୍ତୁ" "ଫିଲ୍ଟର୍" "ଆପଣଙ୍କ ଫୋନରେ ସନ୍ଧାନ କରନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 3df68868a5..e0f213800f 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -168,7 +168,7 @@ "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਬੰਦ ਹਨ। ਤੁਹਾਡੀਆਂ ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਨਹੀਂ ਭੇਜ ਸਕਦੀਆਂ, ਤੁਹਾਡੀ ਬੈਟਰੀ ਨਹੀਂ ਵਰਤ ਸਕਦੀਆਂ ਜਾਂ ਤੁਹਾਡੇ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਨਹੀਂ ਕਰ ਸਕਦੀਆਂ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਨੂੰ ਬੈਜ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਅਤੇ ਇਹ ਤੁਹਾਡੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨੂੰ ਦਿਸਣਗੀਆਂ" "ਸਮਝ ਲਿਆ" - "ਕੰਮ ਸੰਬੰਧੀ ਐਪ ਰੋਕੋ" + "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਰੋਕੋ" "ਕੰਮ ਸੰਬੰਧੀ ਐਪਾਂ ਚਾਲੂ ਕਰੋ" "ਫਿਲਟਰ" "ਆਪਣਾ ਫ਼ੋਨ ਖੋਜੋ" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 1512754d30..3587f7c1a0 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -168,7 +168,7 @@ "As apps de trabalho estão desativadas. As apps de trabalho não podem enviar-lhe notificações, utilizar a bateria ou aceder à sua localização" "As apps de trabalho têm um emblema e estão visíveis para o seu administrador de TI" "OK" - "Colocar apps de trabalho em pausa" + "Pausar apps de trabalho" "Ativar apps de trabalho" "Filtrar" "Pesquise no telemóvel" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 8582baf21b..a6608f3d3b 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -115,7 +115,7 @@ "Zmeniť nastavenia" "Zobrazovať bodky upozornení" "Pre vývojárov" - "Pridať ikony aplikácií na plochu" + "Pridávať ikony aplikácií na plochu" "Pri inštalácii novej aplikácie" "Neznáme" "Odstrániť" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 5c89925a7c..8a9cfbe2c0 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -75,7 +75,7 @@ "అన్ఇన్‌స్టాల్ చేయండి" "యాప్ సమాచారం" "ఇన్‌స్టాల్ చేయండి" - "యాప్‌ను సూచించవద్దు" + "యాప్ సూచించకు" "సూచనను పిన్ చేయండి" "షార్ట్‌కట్‌లను ఇన్‌స్టాల్ చేయడం" "వినియోగదారు ప్రమేయం లేకుండా షార్ట్‌కట్‌లను జోడించడానికి యాప్‌ను అనుమతిస్తుంది." diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 07e5796734..9e8a75ec54 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -103,7 +103,7 @@ "โฟลเดอร์: %1$s, อย่างน้อย %2$d รายการ" "วอลเปเปอร์" "วอลเปเปอร์และรูปแบบ" - "การตั้งค่าหน้าแรก" + "การตั้งค่าหน้าจอหลัก" "ปิดใช้โดยผู้ดูแลระบบ" "อนุญาตให้หมุนหน้าจอหลัก" "เมื่อหมุนโทรศัพท์" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 2b43a4db68..f1eaeafe14 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -115,7 +115,7 @@ "Змінити налаштування" "Показувати значки сповіщень" "Параметри розробника" - "Розміщати значки додатків на головний екран" + "Розміщати значки додатків на головному екрані" "Для нових додатків" "Невідомо" "Прибрати" From 20a9f45281eec3114a02d129df8846b3d30d66f4 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Mon, 22 Aug 2022 13:46:11 -0400 Subject: [PATCH 09/10] Add ScreenRecord for flaky tests Bug: 242163245 Bug: 242163855 Bug: 242163822 Bug: 206481237 Test: presubmit Change-Id: Id1e58c70802107f5b964c1f67bff4ef3a7e5de70 --- tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java | 1 + tests/src/com/android/launcher3/ui/WorkProfileTest.java | 3 +++ .../com/android/launcher3/ui/widget/AddConfigWidgetTest.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java index c3839977cb..f46d78ff97 100644 --- a/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java +++ b/tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java @@ -527,6 +527,7 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { } @Test + @ScreenRecord // b/242163245 public void getIconsPosition_afterIconRemoved_notContained() throws IOException { Point[] gridPositions = getCornersAndCenterPositions(); createShortcutIfNotExist(STORE_APP_NAME, gridPositions[0]); diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java index a7a17b10fb..d4810d850c 100644 --- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java @@ -34,6 +34,7 @@ import com.android.launcher3.allapps.WorkEduCard; import com.android.launcher3.allapps.WorkPausedCard; import com.android.launcher3.allapps.WorkProfileManager; import com.android.launcher3.tapl.LauncherInstrumentation; +import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import org.junit.After; import org.junit.Before; @@ -98,6 +99,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { } @Test + @ScreenRecord // b/242163855 public void workTabExists() { waitForLauncherCondition("Personal tab is missing", launcher -> launcher.getAppsView().isPersonalTabVisible(), @@ -108,6 +110,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { } @Test + @ScreenRecord // b/242163822 public void toggleWorks() { waitForWorkTabSetup(); diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java index 2c9785c93d..655a77e112 100644 --- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java +++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java @@ -33,6 +33,7 @@ import com.android.launcher3.tapl.Widgets; import com.android.launcher3.testcomponent.WidgetConfigActivity; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.TestViewHelpers; +import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; import com.android.launcher3.util.rule.ShellCommandRule; import com.android.launcher3.widget.LauncherAppWidgetProviderInfo; @@ -72,6 +73,7 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest { @Test @PortraitLandscape + @ScreenRecord // b/206481237 public void testConfigCancelled() throws Throwable { runTest(false); } From 7ad8227a08c8a3b4d007bee36682160fcf2602f3 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Tue, 2 Aug 2022 18:32:12 +0000 Subject: [PATCH 10/10] Make test always pass when command fails because command Would cause flakiness if cli command fails. bug: 237428272 test: on AS Change-Id: I0bfe26b9242afffe1399fd9788981f71d8fea73e --- .../com/android/launcher3/ui/WorkProfileTest.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/src/com/android/launcher3/ui/WorkProfileTest.java b/tests/src/com/android/launcher3/ui/WorkProfileTest.java index a7a17b10fb..5761abdea1 100644 --- a/tests/src/com/android/launcher3/ui/WorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/WorkProfileTest.java @@ -21,7 +21,7 @@ import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - +import static org.junit.Assume.assumeTrue; import android.util.Log; import android.view.View; @@ -47,6 +47,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { private static final int WORK_PAGE = ActivityAllAppsContainerView.AdapterHolder.WORK; private int mProfileUserId; + private boolean mWorkProfileSetupSuccessful; @Before @Override @@ -56,7 +57,13 @@ public class WorkProfileTest extends AbstractLauncherUiTest { mDevice.executeShellCommand( "pm create-user --profileOf 0 --managed TestProfile"); Log.d("b/203817455", "pm create-user; output: " + output); - assertTrue("Failed to create work profile", output.startsWith("Success")); + + if (output.startsWith("Success")){ + assertTrue("Failed to create work profile", output.startsWith("Success")); + mWorkProfileSetupSuccessful = true; + } else { + return; // no need to setup launcher since all tests will skip. + } String[] tokens = output.split("\\s+"); mProfileUserId = Integer.parseInt(tokens[tokens.length - 1]); @@ -99,6 +106,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { @Test public void workTabExists() { + assumeTrue(mWorkProfileSetupSuccessful); waitForLauncherCondition("Personal tab is missing", launcher -> launcher.getAppsView().isPersonalTabVisible(), LauncherInstrumentation.WAIT_TIME_MS); @@ -109,8 +117,8 @@ public class WorkProfileTest extends AbstractLauncherUiTest { @Test public void toggleWorks() { + assumeTrue(mWorkProfileSetupSuccessful); waitForWorkTabSetup(); - executeOnLauncher(launcher -> { AllAppsPagedView pagedView = (AllAppsPagedView) launcher.getAppsView().getContentView(); pagedView.setCurrentPage(WORK_PAGE); @@ -152,6 +160,7 @@ public class WorkProfileTest extends AbstractLauncherUiTest { @Test public void testEdu() { + assumeTrue(mWorkProfileSetupSuccessful); waitForWorkTabSetup(); executeOnLauncher(l -> { l.getSharedPrefs().edit().putInt(WorkProfileManager.KEY_WORK_EDU_STEP, 0).commit();