From 2e6148a4307aaf19d80f11f9b1f622201529d955 Mon Sep 17 00:00:00 2001 From: Schneider Victor-Tulias Date: Fri, 16 May 2025 15:39:09 -0400 Subject: [PATCH 01/14] Prevent adding duplicate TaskAnimationManager launcher destroyed callbacks Flag: EXEMPT code cleanup Bug: 416536400 Test: TaskAnimationManagerTest; ran test with and without change Change-Id: I8bdee3adeeca07e386f3058910d5e2160359f7e9 --- .../com/android/quickstep/TaskAnimationManager.java | 11 ++++++++++- .../android/quickstep/TaskAnimationManagerTest.java | 8 ++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java index 9396529fb1..9b7ff0089a 100644 --- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java +++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java @@ -16,6 +16,7 @@ package com.android.quickstep; import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME; +import static android.view.Display.DEFAULT_DISPLAY; import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; @@ -26,7 +27,6 @@ import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_INITIAL import static com.android.quickstep.GestureState.STATE_RECENTS_ANIMATION_STARTED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_NOTIFICATION_PANEL_EXPANDED; import static com.android.systemui.shared.system.QuickStepContract.SYSUI_STATE_QUICK_SETTINGS_EXPANDED; -import static android.view.Display.DEFAULT_DISPLAY; import android.app.ActivityManager; import android.app.ActivityOptions; @@ -86,6 +86,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn private boolean mShouldIgnoreMotionEvents = false; private final int mDisplayId; + private boolean mLauncherDestroyCallbackSet = false; + public static final DaggerSingletonObject> REPOSITORY_INSTANCE = new DaggerSingletonObject<>( QuickstepBaseAppComponent::getTaskAnimationManagerRepository); @@ -180,6 +182,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn RecentsAnimationCallbacks newCallbacks = new RecentsAnimationCallbacks( containerInterface.getCreatedContainer()); mCallbacks = newCallbacks; + mLauncherDestroyCallbackSet = false; mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override public void onRecentsAnimationStart(RecentsAnimationController controller, @@ -509,7 +512,11 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn if (mCallbacks == null) { return; } + if (mLauncherDestroyCallbackSet) { + return; + } ActiveGestureProtoLogProxy.logQueuingForceFinishRecentsAnimation(); + mLauncherDestroyCallbackSet = true; mCallbacks.addListener(new RecentsAnimationCallbacks.RecentsAnimationListener() { @Override public void onRecentsAnimationStart( @@ -521,6 +528,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn /* forceFinish= */ true, /* forceFinishCb= */ null, controller); + mLauncherDestroyCallbackSet = false; } }); } @@ -552,6 +560,7 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn mController = null; mCallbacks = null; + mLauncherDestroyCallbackSet = false; mTargets = null; mTransitionInfo = null; mLastGestureState = null; diff --git a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java index dc7d5c751f..5cecde479b 100644 --- a/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java +++ b/quickstep/tests/multivalentTests/src/com/android/quickstep/TaskAnimationManagerTest.java @@ -17,8 +17,6 @@ package com.android.quickstep; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; @@ -148,6 +146,10 @@ public class TaskAnimationManagerTest { gestureState, new Intent(), mock(RecentsAnimationCallbacks.RecentsAnimationListener.class)); + + // Simulate multiple launcher destroyed events before the recents animation start + mTaskAnimationManager.onLauncherDestroyed(); + mTaskAnimationManager.onLauncherDestroyed(); mTaskAnimationManager.onLauncherDestroyed(); listenerCaptor.getValue().onAnimationStart( controllerCompat, @@ -158,6 +160,8 @@ public class TaskAnimationManagerTest { new Bundle(), new TransitionInfo(0, 0)); }); + + // Verify checks that finish was only called once runOnMainSync(() -> verify(controllerCompat) .finish(/* toHome= */ eq(false), anyBoolean(), any())); } From 52c77ba8c2c03f418d30816597bd079dfef7f4cc Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 15 May 2025 17:12:15 -0600 Subject: [PATCH 02/14] launcher: Remove allow rotation setting from indexable settings Fix: 407675825 Flag: com.android.launcher3.one_grid_specs Test: SettingsIndexablePreferenceKeysTest Change-Id: I5ba3df68c375cf00a604e3b30a47f28acc91165d --- .../res/xml/indexable_launcher_prefs.xml | 7 ++ .../LauncherSearchIndexablesProvider.java | 93 -------------- .../LauncherSearchIndexablesProvider.kt | 117 ++++++++++++++++++ res/values/strings.xml | 3 +- 4 files changed, 126 insertions(+), 94 deletions(-) delete mode 100644 quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java create mode 100644 quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt diff --git a/quickstep/res/xml/indexable_launcher_prefs.xml b/quickstep/res/xml/indexable_launcher_prefs.xml index b4740e5b51..cb31494b2e 100644 --- a/quickstep/res/xml/indexable_launcher_prefs.xml +++ b/quickstep/res/xml/indexable_launcher_prefs.xml @@ -29,4 +29,11 @@ android:defaultValue="false" android:persistent="true" /> + + diff --git a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java deleted file mode 100644 index 5d6fbe2ca6..0000000000 --- a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep; - -import android.annotation.TargetApi; -import android.content.Intent; -import android.content.pm.LauncherApps; -import android.content.pm.ResolveInfo; -import android.content.res.TypedArray; -import android.content.res.XmlResourceParser; -import android.database.Cursor; -import android.database.MatrixCursor; -import android.os.Build; -import android.provider.SearchIndexablesContract.XmlResource; -import android.provider.SearchIndexablesProvider; -import android.util.Xml; - -import com.android.launcher3.R; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; - -import java.io.IOException; - -import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; -import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; -import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; - -@TargetApi(Build.VERSION_CODES.O) -public class LauncherSearchIndexablesProvider extends SearchIndexablesProvider { - @Override - public boolean onCreate() { - return true; - } - - @Override - public Cursor queryXmlResources(String[] strings) { - MatrixCursor cursor = new MatrixCursor(INDEXABLES_XML_RES_COLUMNS); - ResolveInfo settingsActivity = getContext().getPackageManager().resolveActivity( - new Intent(Intent.ACTION_APPLICATION_PREFERENCES) - .setPackage(getContext().getPackageName()), 0); - cursor.newRow() - .add(XmlResource.COLUMN_XML_RESID, R.xml.indexable_launcher_prefs) - .add(XmlResource.COLUMN_INTENT_ACTION, Intent.ACTION_APPLICATION_PREFERENCES) - .add(XmlResource.COLUMN_INTENT_TARGET_PACKAGE, getContext().getPackageName()) - .add(XmlResource.COLUMN_INTENT_TARGET_CLASS, settingsActivity.activityInfo.name); - return cursor; - } - - @Override - public Cursor queryRawData(String[] projection) { - return new MatrixCursor(INDEXABLES_RAW_COLUMNS); - } - - @Override - public Cursor queryNonIndexableKeys(String[] projection) { - MatrixCursor cursor = new MatrixCursor(NON_INDEXABLES_KEYS_COLUMNS); - if (!getContext().getSystemService(LauncherApps.class).hasShortcutHostPermission()) { - // We are not the current launcher. Hide all preferences - try (XmlResourceParser parser = getContext().getResources() - .getXml(R.xml.indexable_launcher_prefs)) { - final int depth = parser.getDepth(); - final int[] attrs = new int[] { android.R.attr.key }; - int type; - while (((type = parser.next()) != XmlPullParser.END_TAG || - parser.getDepth() > depth) && type != XmlPullParser.END_DOCUMENT) { - if (type == XmlPullParser.START_TAG) { - TypedArray a = getContext().obtainStyledAttributes( - Xml.asAttributeSet(parser), attrs); - cursor.addRow(new String[] {a.getString(0)}); - a.recycle(); - } - } - } catch (IOException |XmlPullParserException e) { - throw new RuntimeException(e); - } - } - return cursor; - } -} diff --git a/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt new file mode 100644 index 0000000000..c1fa5776bd --- /dev/null +++ b/quickstep/src/com/android/quickstep/LauncherSearchIndexablesProvider.kt @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2018 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.quickstep + +import android.annotation.TargetApi +import android.content.Intent +import android.content.pm.LauncherApps +import android.database.Cursor +import android.database.MatrixCursor +import android.os.Build +import android.provider.SearchIndexablesContract +import android.provider.SearchIndexablesProvider +import android.util.Xml +import androidx.core.content.withStyledAttributes +import com.android.launcher3.Flags +import com.android.launcher3.InvariantDeviceProfile +import com.android.launcher3.InvariantDeviceProfile.TYPE_TABLET +import com.android.launcher3.R +import java.io.IOException +import org.xmlpull.v1.XmlPullParser +import org.xmlpull.v1.XmlPullParserException + +@TargetApi(Build.VERSION_CODES.O) +class LauncherSearchIndexablesProvider : SearchIndexablesProvider() { + + override fun onCreate(): Boolean = true + + override fun queryXmlResources(strings: Array): Cursor { + val cursor = MatrixCursor(SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS) + val context = context ?: return cursor + val settingsActivity = + context.packageManager.resolveActivity( + Intent(Intent.ACTION_APPLICATION_PREFERENCES).setPackage(context.packageName), + 0, + ) + cursor.newRow().apply { + add( + SearchIndexablesContract.XmlResource.COLUMN_XML_RESID, + R.xml.indexable_launcher_prefs, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_ACTION, + Intent.ACTION_APPLICATION_PREFERENCES, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_TARGET_PACKAGE, + context.packageName, + ) + add( + SearchIndexablesContract.XmlResource.COLUMN_INTENT_TARGET_CLASS, + settingsActivity!!.activityInfo!!.name, + ) + } + + return cursor + } + + fun isDeviceTablet(): Boolean { + return InvariantDeviceProfile.INSTANCE.get(context).deviceType == TYPE_TABLET + } + + override fun queryRawData(projection: Array) = + MatrixCursor(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS) + + override fun queryNonIndexableKeys(projection: Array): Cursor { + val cursor = MatrixCursor(SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS) + if (Flags.oneGridSpecs() && !isDeviceTablet()) { + cursor.addRow(arrayOf(ALLOW_ROTATION_KEY)) + } else { + cursor.addRow(arrayOf(FIXED_LANDSCAPE_KEY)) + } + if (!context!!.getSystemService(LauncherApps::class.java)?.hasShortcutHostPermission()!!) { + // We are not the current launcher. Hide all preferences + try { + context!!.resources!!.getXml(R.xml.indexable_launcher_prefs).use { parser -> + val depth = parser.depth + val attrs = intArrayOf(android.R.attr.key) + var type: Int = parser.next() + while ( + (type != XmlPullParser.END_TAG || parser.depth > depth) && + type != XmlPullParser.END_DOCUMENT + ) { + if (type == XmlPullParser.START_TAG) { + context?.withStyledAttributes(Xml.asAttributeSet(parser), attrs) { + cursor.addRow(arrayOf(getString(0))) + } + } + type = parser.next() + } + } + } catch (e: IOException) { + throw RuntimeException(e) + } catch (e: XmlPullParserException) { + throw RuntimeException(e) + } + } + return cursor + } + + companion object { + private const val ALLOW_ROTATION_KEY = "pref_allowRotation" + private const val FIXED_LANDSCAPE_KEY = "pref_fixed_landscape_mode" + } +} diff --git a/res/values/strings.xml b/res/values/strings.xml index ea1acffd66..57c5148717 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -337,8 +337,9 @@ Landscape mode + - Set phone into landscape mode + Set home screen into landscape mode Notification dots From 2f0de7f6637139cf2a0790ab3e585ca76f863b6a Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 May 2025 19:24:54 +0000 Subject: [PATCH 03/14] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: Ie1ca16291c4c1b3624d6d30a66f7d1a5ae2f674b --- quickstep/res/values-af/strings.xml | 3 ++- quickstep/res/values-am/strings.xml | 3 ++- quickstep/res/values-ar/strings.xml | 3 ++- quickstep/res/values-as/strings.xml | 3 ++- quickstep/res/values-az/strings.xml | 3 ++- quickstep/res/values-b+sr+Latn/strings.xml | 3 ++- quickstep/res/values-be/strings.xml | 3 ++- quickstep/res/values-bg/strings.xml | 3 ++- quickstep/res/values-bn/strings.xml | 5 +++-- quickstep/res/values-bs/strings.xml | 3 ++- quickstep/res/values-ca/strings.xml | 3 ++- quickstep/res/values-cs/strings.xml | 3 ++- quickstep/res/values-da/strings.xml | 3 ++- quickstep/res/values-de/strings.xml | 3 ++- quickstep/res/values-el/strings.xml | 3 ++- quickstep/res/values-en-rAU/strings.xml | 3 ++- quickstep/res/values-en-rCA/strings.xml | 3 ++- quickstep/res/values-en-rGB/strings.xml | 3 ++- quickstep/res/values-en-rIN/strings.xml | 3 ++- quickstep/res/values-es-rUS/strings.xml | 3 ++- quickstep/res/values-es/strings.xml | 3 ++- quickstep/res/values-et/strings.xml | 3 ++- quickstep/res/values-eu/strings.xml | 3 ++- quickstep/res/values-fa/strings.xml | 3 ++- quickstep/res/values-fi/strings.xml | 3 ++- quickstep/res/values-fr-rCA/strings.xml | 3 ++- quickstep/res/values-fr/strings.xml | 3 ++- quickstep/res/values-gl/strings.xml | 3 ++- quickstep/res/values-gu/strings.xml | 3 ++- quickstep/res/values-hi/strings.xml | 3 ++- quickstep/res/values-hr/strings.xml | 3 ++- quickstep/res/values-hu/strings.xml | 3 ++- quickstep/res/values-hy/strings.xml | 3 ++- quickstep/res/values-in/strings.xml | 3 ++- quickstep/res/values-is/strings.xml | 3 ++- quickstep/res/values-it/strings.xml | 3 ++- quickstep/res/values-iw/strings.xml | 3 ++- quickstep/res/values-ja/strings.xml | 3 ++- quickstep/res/values-ka/strings.xml | 3 ++- quickstep/res/values-kk/strings.xml | 3 ++- quickstep/res/values-km/strings.xml | 3 ++- quickstep/res/values-kn/strings.xml | 3 ++- quickstep/res/values-ko/strings.xml | 3 ++- quickstep/res/values-ky/strings.xml | 3 ++- quickstep/res/values-lo/strings.xml | 3 ++- quickstep/res/values-lt/strings.xml | 3 ++- quickstep/res/values-lv/strings.xml | 3 ++- quickstep/res/values-mk/strings.xml | 3 ++- quickstep/res/values-ml/strings.xml | 3 ++- quickstep/res/values-mn/strings.xml | 3 ++- quickstep/res/values-mr/strings.xml | 3 ++- quickstep/res/values-ms/strings.xml | 3 ++- quickstep/res/values-my/strings.xml | 3 ++- quickstep/res/values-nb/strings.xml | 3 ++- quickstep/res/values-ne/strings.xml | 3 ++- quickstep/res/values-nl/strings.xml | 3 ++- quickstep/res/values-or/strings.xml | 3 ++- quickstep/res/values-pa/strings.xml | 3 ++- quickstep/res/values-pl/strings.xml | 3 ++- quickstep/res/values-pt-rPT/strings.xml | 3 ++- quickstep/res/values-pt/strings.xml | 5 +++-- quickstep/res/values-ro/strings.xml | 3 ++- quickstep/res/values-ru/strings.xml | 3 ++- quickstep/res/values-si/strings.xml | 3 ++- quickstep/res/values-sk/strings.xml | 3 ++- quickstep/res/values-sl/strings.xml | 3 ++- quickstep/res/values-sq/strings.xml | 3 ++- quickstep/res/values-sr/strings.xml | 3 ++- quickstep/res/values-sv/strings.xml | 3 ++- quickstep/res/values-sw/strings.xml | 3 ++- quickstep/res/values-ta/strings.xml | 3 ++- quickstep/res/values-te/strings.xml | 5 +++-- quickstep/res/values-th/strings.xml | 3 ++- quickstep/res/values-tl/strings.xml | 3 ++- quickstep/res/values-tr/strings.xml | 3 ++- quickstep/res/values-uk/strings.xml | 3 ++- quickstep/res/values-ur/strings.xml | 3 ++- quickstep/res/values-uz/strings.xml | 3 ++- quickstep/res/values-vi/strings.xml | 3 ++- quickstep/res/values-zh-rCN/strings.xml | 3 ++- quickstep/res/values-zh-rHK/strings.xml | 3 ++- quickstep/res/values-zh-rTW/strings.xml | 3 ++- quickstep/res/values-zu/strings.xml | 3 ++- 83 files changed, 169 insertions(+), 86 deletions(-) diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml index 1c2de3ea72..11377611c9 100644 --- a/quickstep/res/values-af/strings.xml +++ b/quickstep/res/values-af/strings.xml @@ -23,7 +23,8 @@ "Vormvry" "Rekenaar" "Skuif na eksterne skerm" - "Maak toe" + + "Werkskerm" "Geen onlangse items nie" "Programgebruikinstellings" diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml index 63be9b4be5..139146c1ab 100644 --- a/quickstep/res/values-am/strings.xml +++ b/quickstep/res/values-am/strings.xml @@ -23,7 +23,8 @@ "ነፃ ቅጽ" "ዴስክቶፕ" "ወደ ውጫዊ ማሳያ አንቀሳቅስ" - "ዝጋ" + + "ዴስክቶፕ" "ምንም የቅርብ ጊዜ ንጥሎች የሉም" "የመተግበሪያ አጠቃቀም ቅንብሮች" diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml index 7c8aa8c3bb..96da1c1d37 100644 --- a/quickstep/res/values-ar/strings.xml +++ b/quickstep/res/values-ar/strings.xml @@ -23,7 +23,8 @@ "شكل مجاني" "الكمبيوتر المكتبي" "نقل التطبيق إلى شاشة خارجية" - "إغلاق" + + "كمبيوتر مكتبي" "ما مِن عناصر تم استخدامها مؤخرًا" "إعدادات استخدام التطبيق" diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml index e301f084de..1fd0cf5a42 100644 --- a/quickstep/res/values-as/strings.xml +++ b/quickstep/res/values-as/strings.xml @@ -23,7 +23,8 @@ "Freeform" "ডেস্কটপ" "বাহ্যিক ডিছপ্লে’লৈ নিয়ক" - "বন্ধ কৰক" + + "ডেস্কটপ" "কোনো শেহতীয়া বস্তু নাই" "এপে ব্যৱহাৰ কৰা ডেটাৰ ছেটিং" diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml index 553a73df05..084608fc8c 100644 --- a/quickstep/res/values-az/strings.xml +++ b/quickstep/res/values-az/strings.xml @@ -23,7 +23,8 @@ "Sərbəst rejim" "Masaüstü" "Xarici displeyə köçürün" - "Bağlayın" + + "Masaüstü" "Son elementlər yoxdur" "Tətbiq istifadə ayarları" diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml index 850aa6c8f6..c94495a892 100644 --- a/quickstep/res/values-b+sr+Latn/strings.xml +++ b/quickstep/res/values-b+sr+Latn/strings.xml @@ -23,7 +23,8 @@ "Slobodni oblik" "Računar" "Premestite na spoljni ekran" - "Zatvori" + + "Računari" "Nema nedavnih stavki" "Podešavanja korišćenja aplikacije" diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml index caa0291d04..3575550e55 100644 --- a/quickstep/res/values-be/strings.xml +++ b/quickstep/res/values-be/strings.xml @@ -23,7 +23,8 @@ "Адвольная форма" "Працоўны стол" "Перамясціць на знешні дысплэй" - "Закрыць" + + "Працоўны стол" "Няма новых элементаў" "Налады выкарыстання праграмы" diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml index 96298f9d83..b28b7ec239 100644 --- a/quickstep/res/values-bg/strings.xml +++ b/quickstep/res/values-bg/strings.xml @@ -23,7 +23,8 @@ "Свободна форма" "За компютър" "Преместване към външния екран" - "Затваряне" + + "Настолен компютър" "Няма скорошни елементи" "Настройки за използването на приложенията" diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml index 9e673c075b..5aac89341b 100644 --- a/quickstep/res/values-bn/strings.xml +++ b/quickstep/res/values-bn/strings.xml @@ -23,11 +23,12 @@ "ফ্রি-ফর্ম" "ডেস্কটপ" "এক্সটার্নাল ডিসপ্লেতে সরিয়ে নিয়ে যান" - "বন্ধ করুন" + + "ডেস্কটপ" "কোনও সাম্প্রতিক আইটেম নেই" "অ্যাপ ব্যবহারের সেটিংস" - "সবকিছু খালি করুন" + "সব মুছে দিন" "সম্প্রতি ব্যবহৃত অ্যাপ" "%1$s, %2$s" "< ১ মি." diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml index d24cf0a1e0..52410d7511 100644 --- a/quickstep/res/values-bs/strings.xml +++ b/quickstep/res/values-bs/strings.xml @@ -23,7 +23,8 @@ "Slobodan oblik" "Radna površina" "Premještanje na vanjski ekran" - "Zatvaranje" + + "Radna površina" "Nema nedavnih stavki" "Postavke korištenja aplikacije" diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml index 815cf00ba4..66b7683b26 100644 --- a/quickstep/res/values-ca/strings.xml +++ b/quickstep/res/values-ca/strings.xml @@ -23,7 +23,8 @@ "Format lliure" "Escriptori" "Mou a la pantalla externa" - "Tanca" + + "Escriptori" "No hi ha cap element recent" "Configuració d\'ús d\'aplicacions" diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml index 678f5f3a20..54c109b046 100644 --- a/quickstep/res/values-cs/strings.xml +++ b/quickstep/res/values-cs/strings.xml @@ -23,7 +23,8 @@ "Neomezený režim" "Počítač" "Přesunout na externí displej" - "Zavřít" + + "Počítač" "Žádné položky z nedávné doby" "Nastavení využití aplikací" diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml index 0a91c10601..f5b7fb7343 100644 --- a/quickstep/res/values-da/strings.xml +++ b/quickstep/res/values-da/strings.xml @@ -23,7 +23,8 @@ "Frit format" "Computertilstand" "Flyt til ekstern skærm" - "Luk" + + "Computertilstand" "Ingen nye elementer" "Indstillinger for appforbrug" diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml index f45fcd562d..fb19c27998 100644 --- a/quickstep/res/values-de/strings.xml +++ b/quickstep/res/values-de/strings.xml @@ -23,7 +23,8 @@ "Freeform-Modus" "Desktopmodus" "Auf externes Display verschieben" - "Schließen" + + "Desktopmodus" "Keine kürzlich verwendeten Elemente" "Einstellungen zur App-Nutzung" diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml index 31f079aa52..2e6687bcd6 100644 --- a/quickstep/res/values-el/strings.xml +++ b/quickstep/res/values-el/strings.xml @@ -23,7 +23,8 @@ "Ελεύθερη μορφή" "Υπολογιστής" "Μετακίνηση σε εξωτερική οθόνη" - "Κλείσιμο" + + "Υπολογιστής" "Δεν υπάρχουν πρόσφατα στοιχεία" "Ρυθμίσεις χρήσης εφαρμογής" diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml index 35636138c5..79dd16354b 100644 --- a/quickstep/res/values-en-rAU/strings.xml +++ b/quickstep/res/values-en-rAU/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Desktop" "Move to external display" - "Close" + + "Desktop" "No recent items" "App usage settings" diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml index 8f167dbd55..6a95a2a5e1 100644 --- a/quickstep/res/values-en-rCA/strings.xml +++ b/quickstep/res/values-en-rCA/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Desktop" "Move to external display" - "Close" + + "Desktop" "No recent items" "App usage settings" diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml index 35636138c5..79dd16354b 100644 --- a/quickstep/res/values-en-rGB/strings.xml +++ b/quickstep/res/values-en-rGB/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Desktop" "Move to external display" - "Close" + + "Desktop" "No recent items" "App usage settings" diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml index 35636138c5..79dd16354b 100644 --- a/quickstep/res/values-en-rIN/strings.xml +++ b/quickstep/res/values-en-rIN/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Desktop" "Move to external display" - "Close" + + "Desktop" "No recent items" "App usage settings" diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml index 6ed7f8748d..d514562d8f 100644 --- a/quickstep/res/values-es-rUS/strings.xml +++ b/quickstep/res/values-es-rUS/strings.xml @@ -23,7 +23,8 @@ "Formato libre" "Escritorio" "Mover a pantalla externa" - "Cerrar" + + "Computadoras" "No hay elementos recientes" "Configuración de uso de la app" diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml index e1c4dea059..687188e191 100644 --- a/quickstep/res/values-es/strings.xml +++ b/quickstep/res/values-es/strings.xml @@ -23,7 +23,8 @@ "Formato libre" "Escritorio" "Mover a pantalla externa" - "Cerrar" + + "Ordenador" "No hay nada reciente" "Ajustes de uso de la aplicación" diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml index 030c367a65..9de22478cb 100644 --- a/quickstep/res/values-et/strings.xml +++ b/quickstep/res/values-et/strings.xml @@ -23,7 +23,8 @@ "Vabavorm" "Lauaarvuti režiim" "Liikuge välisele ekraanile" - "Sule" + + "Töölaud" "Hiljutisi üksusi pole" "Rakenduse kasutuse seaded" diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml index 770fceb045..675594deec 100644 --- a/quickstep/res/values-eu/strings.xml +++ b/quickstep/res/values-eu/strings.xml @@ -23,7 +23,8 @@ "Modu librea" "Ordenagailua" "Eraman kanpoko pantailara" - "Itxi" + + "Mahaigaina" "Ez dago azkenaldi honetako ezer" "Aplikazioen erabileraren ezarpenak" diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml index cb4f120801..f689c2ce18 100644 --- a/quickstep/res/values-fa/strings.xml +++ b/quickstep/res/values-fa/strings.xml @@ -23,7 +23,8 @@ "Freeform" "حالت رایانه" "انتقال به نمایشگر خارجی" - "بستن" + + "رایانه" "چیز جدیدی اینجا نیست" "تنظیمات استفاده از برنامه" diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml index 273ab3dcaf..a71b2c23b6 100644 --- a/quickstep/res/values-fi/strings.xml +++ b/quickstep/res/values-fi/strings.xml @@ -23,7 +23,8 @@ "Vapaamuotoinen" "Tietokone" "Siirrä ulkoiselle näytölle" - "Sulje" + + "Tietokone" "Ei viimeaikaisia kohteita" "Sovelluksen käyttöasetukset" diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml index 9b39e2e7a3..eb8556ea36 100644 --- a/quickstep/res/values-fr-rCA/strings.xml +++ b/quickstep/res/values-fr-rCA/strings.xml @@ -23,7 +23,8 @@ "Forme libre" "Bureau" "Passer à un écran externe" - "Fermer" + + "Bureau" "Aucun élément récent" "Paramètres d\'utilisation de l\'appli" diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml index 511442ce1a..7262c03490 100644 --- a/quickstep/res/values-fr/strings.xml +++ b/quickstep/res/values-fr/strings.xml @@ -23,7 +23,8 @@ "Format libre" "Mode ordinateur" "Déplacer vers l\'écran externe" - "Fermer" + + "Mode ordinateur" "Aucun élément récent" "Paramètres de consommation de l\'application" diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml index fc36358f34..e5993dc1ba 100644 --- a/quickstep/res/values-gl/strings.xml +++ b/quickstep/res/values-gl/strings.xml @@ -23,7 +23,8 @@ "Forma libre" "Escritorio" "Mover á pantalla externa" - "Pechar" + + "Ordenador" "Non hai elementos recentes" "Configuración do uso de aplicacións" diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml index f58f8293f8..c9b96a41ea 100644 --- a/quickstep/res/values-gu/strings.xml +++ b/quickstep/res/values-gu/strings.xml @@ -23,7 +23,8 @@ "ફ્રિફોર્મ" "ડેસ્કટૉપ" "બાહ્ય ડિસ્પ્લે પર ખસેડો" - "બંધ કરો" + + "ડેસ્કટૉપ" "તાજેતરની કોઈ આઇટમ નથી" "ઍપ વપરાશનું સેટિંગ" diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml index 5ec2893d47..f8ed6a4d1d 100644 --- a/quickstep/res/values-hi/strings.xml +++ b/quickstep/res/values-hi/strings.xml @@ -23,7 +23,8 @@ "फ़्रीफ़ॉर्म" "डेस्कटॉप" "बाहरी डिसप्ले पर जाएं" - "बंद करें" + + "डेस्कटॉप" "हाल ही का कोई आइटम नहीं है" "ऐप्लिकेशन इस्तेमाल की सेटिंग" diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml index 2f69b2b765..62f766479d 100644 --- a/quickstep/res/values-hr/strings.xml +++ b/quickstep/res/values-hr/strings.xml @@ -23,7 +23,8 @@ "Slobodni oblik" "Računalo" "Premještanje na vanjski zaslon" - "Zatvori" + + "Radna površina" "Nema nedavnih stavki" "Postavke upotrebe aplikacija" diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml index 13832b00eb..7a284514f4 100644 --- a/quickstep/res/values-hu/strings.xml +++ b/quickstep/res/values-hu/strings.xml @@ -23,7 +23,8 @@ "Szabad forma" "Asztali" "Áthelyezés külső kijelzőre" - "Bezárás" + + "Asztali" "Nincsenek mostanában használt elemek" "Alkalmazáshasználati beállítások" diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml index 7d7fa6e10a..8f85133646 100644 --- a/quickstep/res/values-hy/strings.xml +++ b/quickstep/res/values-hy/strings.xml @@ -23,7 +23,8 @@ "Կամայական ձև" "Համակարգիչ" "Տեղափոխել արտաքին էկրան" - "Փակել" + + "Համակարգիչ" "Այստեղ դեռ ոչինչ չկա" "Հավելվածի օգտագործման կարգավորումներ" diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml index d6c802e401..11f54ca396 100644 --- a/quickstep/res/values-in/strings.xml +++ b/quickstep/res/values-in/strings.xml @@ -23,7 +23,8 @@ "Format bebas" "Desktop" "Pindahkan ke layar eksternal" - "Tutup" + + "Desktop" "Tidak ada item yang baru dibuka" "Setelan penggunaan aplikasi" diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml index 56f3045d00..b43bb7dd6c 100644 --- a/quickstep/res/values-is/strings.xml +++ b/quickstep/res/values-is/strings.xml @@ -23,7 +23,8 @@ "Frjálst snið" "Tölva" "Færa í annað tæki" - "Loka" + + "Tölva" "Engin nýleg atriði" "Notkunarstillingar forrits" diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml index 50b3aedbfc..2446d11c85 100644 --- a/quickstep/res/values-it/strings.xml +++ b/quickstep/res/values-it/strings.xml @@ -23,7 +23,8 @@ "Forma libera" "Desktop" "Sposta sul display esterno" - "Chiudi" + + "Desktop" "Nessun elemento recente" "Impostazioni di utilizzo delle app" diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml index 67a3696695..920a5a72f0 100644 --- a/quickstep/res/values-iw/strings.xml +++ b/quickstep/res/values-iw/strings.xml @@ -23,7 +23,8 @@ "מצב חופשי" "במחשב" "העברה למסך חיצוני" - "סגירה" + + "מחשב" "אין פריטים אחרונים" "הגדרות שימוש באפליקציה" diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml index 546e068864..1f3b6cdec9 100644 --- a/quickstep/res/values-ja/strings.xml +++ b/quickstep/res/values-ja/strings.xml @@ -23,7 +23,8 @@ "フリーフォーム" "デスクトップ" "外部ディスプレイに移動する" - "閉じる" + + "デスクトップ" "最近のアイテムはありません" "アプリの使用状況の設定" diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml index 483b76cbee..a135cdc8b4 100644 --- a/quickstep/res/values-ka/strings.xml +++ b/quickstep/res/values-ka/strings.xml @@ -23,7 +23,8 @@ "თავისუფალი ფორმა" "დესკტოპი" "გარე ეკრანზე გადასვლა" - "დახურვა" + + "დესკტოპი" "ბოლოს გამოყენებული ერთეულები არ არის" "აპების გამოყენების პარამეტრები" diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml index 6088043d06..539b942dfe 100644 --- a/quickstep/res/values-kk/strings.xml +++ b/quickstep/res/values-kk/strings.xml @@ -23,7 +23,8 @@ "Еркін форма" "Компьютер" "Сыртқы дисплейге ауыстыру" - "Жабу" + + "Жұмыс үстелі" "Соңғы элементтер жоқ" "Қолданбаны пайдалану параметрлері" diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml index 2f256db57f..0483326cb2 100644 --- a/quickstep/res/values-km/strings.xml +++ b/quickstep/res/values-km/strings.xml @@ -23,7 +23,8 @@ "មុខងារទម្រង់សេរី" "ដែសថប" "ផ្លាស់ទីទៅផ្ទាំងអេក្រង់ខាងក្រៅ" - "បិទ" + + "អេក្រង់ដើម" "មិនមានធាតុថ្មីៗទេ" "ការកំណត់​ការប្រើប្រាស់​កម្មវិធី" diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml index a9326c3be3..0a80e5af76 100644 --- a/quickstep/res/values-kn/strings.xml +++ b/quickstep/res/values-kn/strings.xml @@ -23,7 +23,8 @@ "ಮುಕ್ತಸ್ವರೂಪ" "ಡೆಸ್ಕ್‌ಟಾಪ್" "ಬಾಹ್ಯ ಡಿಸ್‌ಪ್ಲೇಗೆ ಸರಿಸಿ" - "ಮುಚ್ಚಿರಿ" + + "ಡೆಸ್ಕ್‌ಟಾಪ್" "ಯಾವುದೇ ಇತ್ತೀಚಿನ ಐಟಂಗಳಿಲ್ಲ" "ಆ್ಯಪ್‌ ಬಳಕೆಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು" diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml index a43267e7e2..cdf799f3f7 100644 --- a/quickstep/res/values-ko/strings.xml +++ b/quickstep/res/values-ko/strings.xml @@ -23,7 +23,8 @@ "자유 형식" "데스크톱" "외부 디스플레이로 이동" - "닫기" + + "데스크톱" "최근 항목이 없습니다." "앱 사용 설정" diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml index 89c0d93d30..27ffdce5a0 100644 --- a/quickstep/res/values-ky/strings.xml +++ b/quickstep/res/values-ky/strings.xml @@ -23,7 +23,8 @@ "Эркин форма режими" "Компьютер" "Тышкы экранга жылдыруу" - "Жабуу" + + "Компьютер" "Акыркы колдонмолор жок" "Колдонмону пайдалануу параметрлери" diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml index d9159a8cdd..aba635eb42 100644 --- a/quickstep/res/values-lo/strings.xml +++ b/quickstep/res/values-lo/strings.xml @@ -23,7 +23,8 @@ "ຮູບແບບອິດສະຫລະ" "ເດັສທັອບ" "ຍ້າຍໄປຫາຈໍສະແດງຜົນພາຍນອກ" - "ປິດ" + + "ເດັສທັອບ" "ບໍ່ມີລາຍການຫຼ້າສຸດ" "ການຕັ້ງຄ່າການນຳໃຊ້ແອັບ" diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml index 0b9e6b9b12..8bf87eb945 100644 --- a/quickstep/res/values-lt/strings.xml +++ b/quickstep/res/values-lt/strings.xml @@ -23,7 +23,8 @@ "Laisva forma" "Stalinis kompiuteris" "Perkelkite į išorinį ekraną" - "Uždaryti" + + "Stalinis kompiuteris" "Nėra jokių naujausių elementų" "Programos naudojimo nustatymai" diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml index e01afca87c..75ed74d68f 100644 --- a/quickstep/res/values-lv/strings.xml +++ b/quickstep/res/values-lv/strings.xml @@ -23,7 +23,8 @@ "Brīva forma" "Dators" "Pārvietošana uz ārējo displeju" - "Aizvērt" + + "Darbvirsma" "Nav nesenu vienumu." "Lietotņu izmantošanas iestatījumi" diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml index 47d404b56b..2a4b29986b 100644 --- a/quickstep/res/values-mk/strings.xml +++ b/quickstep/res/values-mk/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Работна површина" "Префрлете се на надворешниот екран" - "Затвори" + + "За компјутер" "Нема неодамнешни ставки" "Поставки за користење на апликациите" diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml index 1576306da8..323a518045 100644 --- a/quickstep/res/values-ml/strings.xml +++ b/quickstep/res/values-ml/strings.xml @@ -23,7 +23,8 @@ "ഫ്രീഫോം" "ഡെസ്‌ക്ടോപ്പ്" "ബാഹ്യ ഡിസ്‌പ്ലേയിലേക്ക് നീക്കുക" - "അടയ്‌ക്കുക" + + "ഡെസ്‌ക്ടോപ്പ്" "സമീപകാല ഇനങ്ങൾ ഒന്നുമില്ല" "ആപ്പ് ഉപയോഗ ക്രമീകരണം" diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml index 095af68173..d046958167 100644 --- a/quickstep/res/values-mn/strings.xml +++ b/quickstep/res/values-mn/strings.xml @@ -23,7 +23,8 @@ "Чөлөөтэй хувьсах" "Компьютер" "Гадаад дэлгэц рүү зөөх" - "Хаах" + + "Дэлгэц" "Сүүлийн үеийн зүйл алга" "Апп ашиглалтын тохиргоо" diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml index 9baedc9fdc..4cc33119f0 100644 --- a/quickstep/res/values-mr/strings.xml +++ b/quickstep/res/values-mr/strings.xml @@ -23,7 +23,8 @@ "फ्रीफॉर्म" "डेस्कटॉप" "बाह्य डिस्प्लेवर हलवा" - "बंद करा" + + "डेस्कटॉप" "कोणतेही अलीकडील आयटम नाहीत" "अ‍ॅप वापर सेटिंग्ज" diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml index 46b8b9e253..8b65dd680a 100644 --- a/quickstep/res/values-ms/strings.xml +++ b/quickstep/res/values-ms/strings.xml @@ -23,7 +23,8 @@ "Bentuk bebas" "Desktop" "Alihkan kepada paparan luaran" - "Tutup" + + "Desktop" "Tiada item terbaharu" "Tetapan penggunaan apl" diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml index 893e33fb53..80aace9c37 100644 --- a/quickstep/res/values-my/strings.xml +++ b/quickstep/res/values-my/strings.xml @@ -23,7 +23,8 @@ "အလွတ်ပုံစံ" "ဒက်စ်တော့" "ပြင်ပဖန်သားပြင်သို့ ရွှေ့ရန်" - "ပိတ်ရန်" + + "ဒက်စ်တော့" "မကြာမီကဖွင့်ထားသည်များ မရှိပါ" "အက်ပ်အသုံးပြုမှု ဆက်တင်များ" diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index aa8adad471..b5bac4d181 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -23,7 +23,8 @@ "Fritt format" "Skrivebord" "Flytt til ekstern skjerm" - "Lukk" + + "Skrivebord" "Ingen nylige elementer" "Innstillinger for appbruk" diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml index f4e9933890..43c189c729 100644 --- a/quickstep/res/values-ne/strings.xml +++ b/quickstep/res/values-ne/strings.xml @@ -23,7 +23,8 @@ "फ्रिफर्म" "डेस्कटप" "सारेर बाह्य डिस्प्लेमा लैजानुहोस्" - "बन्द गर्नुहोस्" + + "डेस्कटप" "हालसालैको कुनै पनि सामग्री छैन" "एपको उपयोगका सेटिङहरू" diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml index f36ef45c9e..26a9c23a11 100644 --- a/quickstep/res/values-nl/strings.xml +++ b/quickstep/res/values-nl/strings.xml @@ -23,7 +23,8 @@ "Vrije vorm" "Desktop" "Verplaatsen naar extern scherm" - "Sluiten" + + "Desktop" "Geen recente items" "Instellingen voor app-gebruik" diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index 7bedfe14c6..8f43ddc941 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -23,7 +23,8 @@ "ଫ୍ରିଫର୍ମ" "ଡେସ୍କଟପ" "ଏକ୍ସଟର୍ନଲ ଡିସପ୍ଲେକୁ ମୁଭ କରନ୍ତୁ" - "ବନ୍ଦ କରନ୍ତୁ" + + "ଡେସ୍କଟପ" "ବର୍ତ୍ତମାନର କୌଣସି ଆଇଟମ ନାହିଁ" "ଆପ ବ୍ୟବହାର ସେଟିଂସ" diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml index f9e7fc31da..0edb4556da 100644 --- a/quickstep/res/values-pa/strings.xml +++ b/quickstep/res/values-pa/strings.xml @@ -23,7 +23,8 @@ "ਫ੍ਰੀਫਾਰਮ" "ਡੈਸਕਟਾਪ" "ਬਾਹਰੀ ਡਿਸਪਲੇ \'ਤੇ ਜਾਓ" - "ਬੰਦ ਕਰੋ" + + "ਡੈਸਕਟਾਪ" "ਕੋਈ ਹਾਲੀਆ ਆਈਟਮ ਨਹੀਂ" "ਐਪ ਵਰਤੋਂ ਦੀਆਂ ਸੈਟਿੰਗਾਂ" diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml index 2db15c8154..3624d291a9 100644 --- a/quickstep/res/values-pl/strings.xml +++ b/quickstep/res/values-pl/strings.xml @@ -23,7 +23,8 @@ "Tryb dowolny" "Pulpit" "Przenieś na wyświetlacz zewnętrzny" - "Zamknij" + + "Pulpit" "Brak ostatnich elementów" "Ustawienia użycia aplikacji" diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml index ff07875f05..ccade35a40 100644 --- a/quickstep/res/values-pt-rPT/strings.xml +++ b/quickstep/res/values-pt-rPT/strings.xml @@ -23,7 +23,8 @@ "Forma livre" "Computador" "Mover para o ecrã externo" - "Fechar" + + "Computador" "Nenhum item recente" "Definições de utilização de aplicações" diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml index 1f886bb648..2a335a01a4 100644 --- a/quickstep/res/values-pt/strings.xml +++ b/quickstep/res/values-pt/strings.xml @@ -23,7 +23,8 @@ "Forma livre" "Modo área de trabalho" "Mover para a tela externa" - "Fechar" + + "Computador" "Nenhum item recente" "Configurações de uso do app" @@ -158,7 +159,7 @@ "Dispensar todos" "abrir %1$s" "fechar %1$s" - "Circule para pesquisar" + "Circule para Pesquisar" "Ícone do app" "Título do app" "Botão \"Fechar\"" diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 2fe16f353a..355890f523 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -23,7 +23,8 @@ "Formă liberă" "Desktop" "Mută pe ecranul extern" - "Închide" + + "Computer" "Niciun element recent" "Setări de utilizare a aplicației" diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml index d5c1dcf433..14b27089c1 100644 --- a/quickstep/res/values-ru/strings.xml +++ b/quickstep/res/values-ru/strings.xml @@ -23,7 +23,8 @@ "Произвольная форма" "Мультиоконный режим" "Перенести на внешний дисплей" - "Закрыть" + + "Мультиоконный режим" "Здесь пока ничего нет." "Настройки использования приложения" diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml index 4c90637412..6e9e2bb497 100644 --- a/quickstep/res/values-si/strings.xml +++ b/quickstep/res/values-si/strings.xml @@ -23,7 +23,8 @@ "Freeform" "ඩෙස්ක්ටොපය" "බාහිර සංදර්ශකය වෙත ගෙන යන්න" - "වසන්න" + + "ඩෙස්ක්ටොපය" "මෑත අයිතම නැත" "යෙදුම් භාවිත සැකසීම්" diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml index 6afd72c9d0..e93b4c08d2 100644 --- a/quickstep/res/values-sk/strings.xml +++ b/quickstep/res/values-sk/strings.xml @@ -23,7 +23,8 @@ "Voľný režim" "Počítač" "Presunúť na externú obrazovku" - "Zavrieť" + + "Počítač" "Žiadne nedávne položky" "Nastavenia využívania aplikácie" diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml index 652ffa329f..d6d0e6d9ff 100644 --- a/quickstep/res/values-sl/strings.xml +++ b/quickstep/res/values-sl/strings.xml @@ -23,7 +23,8 @@ "Prosta oblika" "Namizni računalnik" "Premik v zunanji zaslon" - "Zapri" + + "Namizni način" "Ni nedavnih elementov" "Nastavitve uporabe aplikacij" diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml index d1db36727d..a4eca4e815 100644 --- a/quickstep/res/values-sq/strings.xml +++ b/quickstep/res/values-sq/strings.xml @@ -23,7 +23,8 @@ "Formë e lirë" "Desktopi" "Zhvendose tek ekrani i jashtëm" - "Mbyll" + + "Desktopi" "Nuk ka asnjë artikull të fundit" "Cilësimet e përdorimit të aplikacionit" diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml index e0089914f2..bf42d73f85 100644 --- a/quickstep/res/values-sr/strings.xml +++ b/quickstep/res/values-sr/strings.xml @@ -23,7 +23,8 @@ "Слободни облик" "Рачунар" "Преместите на спољни екран" - "Затвори" + + "Рачунари" "Нема недавних ставки" "Подешавања коришћења апликације" diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml index 2f5ad5bd33..07700ea029 100644 --- a/quickstep/res/values-sv/strings.xml +++ b/quickstep/res/values-sv/strings.xml @@ -23,7 +23,8 @@ "Fritt format" "Skrivbordsläge" "Flytta till extern skärm" - "Stäng" + + "Skrivbordsläge" "Listan är tom" "Inställningar för appanvändning" diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml index b063227bfd..582d74a9b4 100644 --- a/quickstep/res/values-sw/strings.xml +++ b/quickstep/res/values-sw/strings.xml @@ -23,7 +23,8 @@ "Muundo huru" "Kompyuta ya mezani" "Hamishia programu kwenye skrini ya nje" - "Funga" + + "Kompyuta ya Mezani" "Hakuna vipengee vya hivi karibuni" "Mipangilio ya matumizi ya programu" diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml index 2cf64b5c6c..90d52f6008 100644 --- a/quickstep/res/values-ta/strings.xml +++ b/quickstep/res/values-ta/strings.xml @@ -23,7 +23,8 @@ "குறிப்பிட்ட வடிவமில்லாத பயன்முறை" "டெஸ்க்டாப்" "வெளிப்புற டிஸ்ப்ளேவிற்கு நகர்த்துதல்" - "மூடு" + + "டெஸ்க்டாப்" "சமீபத்தியவை எதுவுமில்லை" "ஆப்ஸ் உபயோக அமைப்புகள்" diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml index f1de3b5b39..da15763abb 100644 --- a/quickstep/res/values-te/strings.xml +++ b/quickstep/res/values-te/strings.xml @@ -23,7 +23,8 @@ "సంప్రదాయేతర" "డెస్క్‌టాప్" "ఎక్స్‌టర్నల్ డిస్‌ప్లేకు తరలించండి" - "మూసివేయండి" + + "డెస్క్‌టాప్" "ఇటీవలి ఐటెమ్‌లు ఏవీ లేవు" "యాప్ వినియోగ సెట్టింగ్‌లు" @@ -68,7 +69,7 @@ "మీరు మొదటి స్క్రీన్‌కు వెళ్లే సంజ్ఞను పూర్తి చేశారు" "మొదటి స్క్రీన్‌కు వెళ్లడానికి స్వైప్ చేయండి" "స్క్రీన్ కింది నుండి పైకి స్వైప్ చేయండి. ఈ సంజ్ఞ ఎప్పుడూ మిమ్మల్ని మొదటి స్క్రీన్‌కు తీసుకెళ్తుంది." - "మొదటి ట్యాబ్‌కు వెళ్లండి" + "హోం స్క్రీన్‌కు వెళ్లండి" "స్క్రీన్ కింది భాగం నుండి పైకి స్వైప్ చేయండి" "బాగా చేశారు!" "మీరు స్క్రీన్ దిగువ అంచు నుండి పైకి స్వైప్ చేశారని నిర్ధారించుకోండి" diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml index 69eee1e961..382639241a 100644 --- a/quickstep/res/values-th/strings.xml +++ b/quickstep/res/values-th/strings.xml @@ -23,7 +23,8 @@ "รูปแบบอิสระ" "เดสก์ท็อป" "ย้ายไปยังจอแสดงผลภายนอก" - "ปิด" + + "เดสก์ท็อป" "ไม่มีรายการล่าสุด" "การตั้งค่าการใช้แอป" diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml index ac6aa75841..90018373e5 100644 --- a/quickstep/res/values-tl/strings.xml +++ b/quickstep/res/values-tl/strings.xml @@ -23,7 +23,8 @@ "Freeform" "Desktop" "Ilipat sa external na display" - "Isara" + + "Desktop" "Walang kamakailang item" "Mga setting ng paggamit ng app" diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml index bfa0d03937..f63f2fd7ad 100644 --- a/quickstep/res/values-tr/strings.xml +++ b/quickstep/res/values-tr/strings.xml @@ -23,7 +23,8 @@ "Serbest çalışma" "Masaüstü" "Harici ekrana taşı" - "Kapat" + + "Masaüstü" "Yeni öğe yok" "Uygulama kullanım ayarları" diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml index 81c258f7f7..c924fe04bd 100644 --- a/quickstep/res/values-uk/strings.xml +++ b/quickstep/res/values-uk/strings.xml @@ -23,7 +23,8 @@ "Довільна форма" "Робочий стіл" "Перемістити на зовнішній екран" - "Закрити" + + "Комп’ютер" "Немає нещодавніх додатків" "Налаштування використання додатка" diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml index 625ba85766..e5a7aba95e 100644 --- a/quickstep/res/values-ur/strings.xml +++ b/quickstep/res/values-ur/strings.xml @@ -23,7 +23,8 @@ "فری فارم" "ڈیسک ٹاپ" "بیرونی ڈسپلے پر متقل کریں" - "بند کریں" + + "ڈیسک ٹاپ" "کوئی حالیہ آئٹم نہیں" "ایپ کے استعمال کی ترتیبات" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index c1f31ed3c4..8289dad7c7 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -23,7 +23,8 @@ "Erkin shakl" "Desktop" "Tashqi displeyga olish" - "Yopish" + + "Desktop" "Yaqinda ishlatilgan ilovalar yo‘q" "Ilovadan foydalanish sozlamalari" diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml index 1207cbe97a..f42855f195 100644 --- a/quickstep/res/values-vi/strings.xml +++ b/quickstep/res/values-vi/strings.xml @@ -23,7 +23,8 @@ "Dạng tự do" "Máy tính" "Chuyển sang màn hình ngoài" - "Đóng" + + "Máy tính" "Không có mục gần đây nào" "Cài đặt mức sử dụng ứng dụng" diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml index 4c0a35c3f9..92d77f7f05 100644 --- a/quickstep/res/values-zh-rCN/strings.xml +++ b/quickstep/res/values-zh-rCN/strings.xml @@ -23,7 +23,8 @@ "自由窗口" "桌面" "移至外接显示屏" - "关闭" + + "桌面设备" "近期没有任何内容" "应用使用设置" diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml index 89dbdea992..4e93c81bd0 100644 --- a/quickstep/res/values-zh-rHK/strings.xml +++ b/quickstep/res/values-zh-rHK/strings.xml @@ -23,7 +23,8 @@ "自由形式" "桌面" "移至外部顯示屏" - "關閉" + + "桌面" "最近沒有任何項目" "應用程式使用情況設定" diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml index 43d180ef95..63fc197591 100644 --- a/quickstep/res/values-zh-rTW/strings.xml +++ b/quickstep/res/values-zh-rTW/strings.xml @@ -23,7 +23,8 @@ "自由形式" "電腦模式" "移至外接螢幕" - "關閉" + + "電腦模式" "最近沒有任何項目" "應用程式使用情況設定" diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml index b62974eea7..625bed271a 100644 --- a/quickstep/res/values-zu/strings.xml +++ b/quickstep/res/values-zu/strings.xml @@ -23,7 +23,8 @@ "I-Freeform" "Ideskithophu" "Hambisa esibonisini sangaphandle" - "Vala" + + "Ideskithophu" "Azikho izinto zakamuva" "Izilungiselelo zokusetshenziswa kohlelo lokusebenza" From 13bf828a27a0165a635a3f1a49561b3051525f27 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 19 May 2025 19:25:56 +0000 Subject: [PATCH 04/14] Import translations. DO NOT MERGE ANYWHERE Auto-generated-cl: translation import Change-Id: I9b8d0ca663aeb20227f2b5b55949a57e3de317c4 --- res/values-th/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 6e95f5d266..aaa0c0b0e3 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -65,7 +65,7 @@ "ล้างข้อความออกจากช่องค้นหา" "วิดเจ็ตและทางลัดไม่พร้อมให้บริการ" "ไม่พบวิดเจ็ตหรือทางลัด" - "ส่วนตัว" + "ส่วนบุคคล" "งาน" "การสนทนา" "การจดบันทึก" From 0c6c1d730968fe56e3074d1f2ec3a0cf0cd5f53e Mon Sep 17 00:00:00 2001 From: Saumya Prakash Date: Mon, 19 May 2025 23:33:32 +0000 Subject: [PATCH 05/14] Modify Gesture nav edu to new UX specs This change adapts the "Done" button in the gesture navigation tutorial according to new UX specs. Specifically, the button is wider and may have a different font according to theme. Fix: 416144733 Test: Run the gesture navigation tutorial and observe the done button Flag: EXEMPT bugfix Change-Id: I4732a21c76e5a0e95433a211cd747cb36aaeaa4d --- .../res/layout-sw600dp-land/gesture_tutorial_step_menu.xml | 5 +++-- quickstep/res/layout/gesture_tutorial_step_menu.xml | 5 +++-- .../res/layout/redesigned_gesture_tutorial_fragment.xml | 3 ++- quickstep/res/values/dimens.xml | 2 ++ .../src/com/android/quickstep/interaction/MenuFragment.java | 3 +++ 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml b/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml index 0767aa566c..374f17c2e4 100644 --- a/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml +++ b/quickstep/res/layout-sw600dp-land/gesture_tutorial_step_menu.xml @@ -158,8 +158,9 @@