diff --git a/Android.bp b/Android.bp index f5a38b4e6f..5a153a7d12 100644 --- a/Android.bp +++ b/Android.bp @@ -208,6 +208,8 @@ filegroup { srcs: [ "ext_tests/src/**/*.java", "ext_tests/src/**/*.kt", + "quickstep/ext_tests/src/**/*.java", + "quickstep/ext_tests/src/**/*.kt", ], } @@ -224,6 +226,21 @@ filegroup { ], } +// Common source files used to build go launcher +filegroup { + name: "launcher-go-src-no-build-config", + srcs: [ + "src/**/*.java", + "src/**/*.kt", + "quickstep/src/**/*.java", + "quickstep/src/**/*.kt", + "go/src/**/*.java", + "go/src/**/*.kt", + "go/quickstep/src/**/*.java", + "go/quickstep/src/**/*.kt", + ], +} + // Proguard files for Launcher3 filegroup { name: "launcher-proguard-rules", diff --git a/OWNERS b/OWNERS index 05fa502b34..7f98ea6a78 100644 --- a/OWNERS +++ b/OWNERS @@ -39,6 +39,7 @@ peanutbutter@google.com xuqiu@google.com sreyasr@google.com thiruram@google.com +brianji@google.com per-file FeatureFlags.java, globs = set noparent per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, zakcohen@google.com, mrcasey@google.com, adamcohen@google.com, hyunyoungs@google.com diff --git a/build.gradle b/build.gradle index e4ade88af8..68ed73d60a 100644 --- a/build.gradle +++ b/build.gradle @@ -170,7 +170,7 @@ dependencies { protobuf { // Configure the protoc executable protoc { - artifact = "com.google.protobuf:protoc:${protocVersion}" + artifact = "com.google.protobuf:protoc:${protocVersion}${PROTO_ARCH_SUFFIX}" } generateProtoTasks { all().each { task -> diff --git a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java index 02206c0dc9..d16e12c9b8 100644 --- a/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java +++ b/ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java @@ -29,8 +29,10 @@ import android.view.View; import androidx.annotation.Keep; import androidx.annotation.Nullable; +import com.android.launcher3.BubbleTextView; import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherSettings; +import com.android.launcher3.ShortcutAndWidgetContainer; import java.util.ArrayList; import java.util.Collection; @@ -205,6 +207,32 @@ public class DebugTestInformationHandler extends TestInformationHandler { } } + case TestProtocol.REQUEST_USE_TEST_WORKSPACE_LAYOUT: { + useTestWorkspaceLayout(true); + return response; + } + + case TestProtocol.REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT: { + useTestWorkspaceLayout(false); + return response; + } + + case TestProtocol.REQUEST_HOTSEAT_ICON_NAMES: { + return getLauncherUIProperty(Bundle::putStringArrayList, l -> { + ShortcutAndWidgetContainer hotseatIconsContainer = + l.getHotseat().getShortcutsAndWidgets(); + ArrayList hotseatIconNames = new ArrayList<>(); + + for (int i = 0; i < hotseatIconsContainer.getChildCount(); i++) { + // Use unchecked cast to catch changes in hotseat layout + BubbleTextView icon = (BubbleTextView) hotseatIconsContainer.getChildAt(i); + hotseatIconNames.add((String) icon.getText()); + } + + return hotseatIconNames; + }); + } + case TestProtocol.REQUEST_GET_ACTIVITIES_CREATED_COUNT: { response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, sActivitiesCreatedCount); return response; @@ -223,4 +251,15 @@ public class DebugTestInformationHandler extends TestInformationHandler { return super.call(method, arg, extras); } } + + private void useTestWorkspaceLayout(boolean useTestWorkspaceLayout) { + final long identity = Binder.clearCallingIdentity(); + try { + LauncherSettings.Settings.call(mContext.getContentResolver(), useTestWorkspaceLayout + ? LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG + : LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG); + } finally { + Binder.restoreCallingIdentity(identity); + } + } } diff --git a/fill_screens.py b/fill_screens.py deleted file mode 100755 index a88779261e..0000000000 --- a/fill_screens.py +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env python2.5 - -import cgi -import os -import shutil -import sys -import sqlite3 - -SCREENS = 5 -COLUMNS = 4 -ROWS = 4 -CELL_SIZE = 110 - -DIR = "db_files" -AUTO_FILE = "launcher.db" - -APPLICATION_COMPONENTS = [ - "com.android.calculator2/com.android.calculator2.Calculator", - "com.android.providers.downloads.ui/com.android.providers.downloads.ui.DownloadList", - "com.android.settings/com.android.settings.Settings", - "com.android.mms/com.android.mms.ui.ConversationList", - "com.android.contacts/com.android.contacts.activities.PeopleActivity", - "com.android.dialer/com.android.dialer.DialtactsActivity" -] - -def usage(): - print "usage: fill_screens.py -- fills up the launcher db" - - -def make_dir(): - shutil.rmtree(DIR, True) - os.makedirs(DIR) - -def pull_file(fn): - print "pull_file: " + fn - rv = os.system("adb pull" - + " /data/data/com.android.launcher/databases/launcher.db" - + " " + fn); - if rv != 0: - print "adb pull failed" - sys.exit(1) - -def push_file(fn): - print "push_file: " + fn - rv = os.system("adb push" - + " " + fn - + " /data/data/com.android.launcher/databases/launcher.db") - if rv != 0: - print "adb push failed" - sys.exit(1) - -def process_file(fn): - print "process_file: " + fn - conn = sqlite3.connect(fn) - c = conn.cursor() - c.execute("DELETE FROM favorites") - - intentFormat = "#Intent;action=android.intent.action.MAIN;category=android.intent.category.LAUNCHER;launchFlags=0x10200000;component=%s;end" - - id = 0; - for s in range(SCREENS): - for x in range(ROWS): - for y in range(COLUMNS): - id += 1 - insert = "INSERT into favorites (_id, title, intent, container, screen, cellX, cellY, spanX, spanY, itemType, appWidgetId, iconType) VALUES (%d, '%s', '%s', %d, %d, %d, %d, %d, %d, %d, %d, %d)" - insert = insert % (id, "title", "", -100, s, x, y, 1, 1, 2, -1, 0) - c.execute(insert) - folder_id = id - - for z in range(15): - id += 1 - intent = intentFormat % (APPLICATION_COMPONENTS[id % len(APPLICATION_COMPONENTS)]) - insert = "INSERT into favorites (_id, title, intent, container, screen, cellX, cellY, spanX, spanY, itemType, appWidgetId, iconType) VALUES (%d, '%s', '%s', %d, %d, %d, %d, %d, %d, %d, %d, %d)" - insert = insert % (id, "title", intent, folder_id, 0, 0, 0, 1, 1, 0, -1, 0) - c.execute(insert) - - conn.commit() - c.close() - -def main(argv): - if len(argv) == 1: - make_dir() - pull_file(AUTO_FILE) - process_file(AUTO_FILE) - push_file(AUTO_FILE) - else: - usage() - -if __name__=="__main__": - main(sys.argv) diff --git a/go/quickstep/res/values-ar/strings.xml b/go/quickstep/res/values-ar/strings.xml index e05ee5eda2..7d981849a1 100644 --- a/go/quickstep/res/values-ar/strings.xml +++ b/go/quickstep/res/values-ar/strings.xml @@ -4,7 +4,7 @@ "مشاركة التطبيق" "استماع" "‏ترجمة Google" - "‏عدسة Google" + "عدسة" "حسنًا" "إلغاء" "الإعدادات" diff --git a/go/quickstep/res/values-bn/strings.xml b/go/quickstep/res/values-bn/strings.xml index 60671912c8..8c27e63376 100644 --- a/go/quickstep/res/values-bn/strings.xml +++ b/go/quickstep/res/values-bn/strings.xml @@ -4,7 +4,7 @@ "অ্যাপ শেয়ার করুন" "শুনুন" "অনুবাদ করুন" - "লেন্স" + "Lens" "বুঝেছি" "বাতিল করুন" "সেটিংস" diff --git a/go/quickstep/res/values-gu/strings.xml b/go/quickstep/res/values-gu/strings.xml index faa66fcc40..80d9e2ec30 100644 --- a/go/quickstep/res/values-gu/strings.xml +++ b/go/quickstep/res/values-gu/strings.xml @@ -4,7 +4,7 @@ "ઍપ શેર કરો" "સાંભળો" "અનુવાદ કરો" - "લેન્સ" + "Lens" "સમજાઈ ગયું" "રદ કરો" "સેટિંગ" diff --git a/go/quickstep/res/values-kk/strings.xml b/go/quickstep/res/values-kk/strings.xml index 2361cbb619..2a2f96db54 100644 --- a/go/quickstep/res/values-kk/strings.xml +++ b/go/quickstep/res/values-kk/strings.xml @@ -4,7 +4,7 @@ "Қолданбаны бөлісу" "Тыңдау" "Аудару" - "Объектив" + "Lens" "ТҮСІНІКТІ" "БАС ТАРТУ" "ПАРАМЕТРЛЕР" diff --git a/go/quickstep/res/values-ml/strings.xml b/go/quickstep/res/values-ml/strings.xml index 19d0b75a5e..ed5739568c 100644 --- a/go/quickstep/res/values-ml/strings.xml +++ b/go/quickstep/res/values-ml/strings.xml @@ -4,7 +4,7 @@ "ആപ്പ് പങ്കിടുക" "കേൾക്കുക" "വിവർത്തനം ചെയ്യുക" - "ലെൻസ്" + "Lens" "മനസ്സിലായി" "റദ്ദാക്കുക" "ക്രമീകരണം" diff --git a/go/quickstep/res/values-mn/strings.xml b/go/quickstep/res/values-mn/strings.xml index 2eb3c98979..d03b2d2ad7 100644 --- a/go/quickstep/res/values-mn/strings.xml +++ b/go/quickstep/res/values-mn/strings.xml @@ -4,7 +4,7 @@ "Аппыг хуваалцах" "Сонсох" "Орчуулах" - "Дуран" + "Lens" "ОЙЛГОЛОО" "ЦУЦЛАХ" "ТОХИРГОО" diff --git a/go/quickstep/res/values-ms/strings.xml b/go/quickstep/res/values-ms/strings.xml index 36e167878a..3b0a7fbe71 100644 --- a/go/quickstep/res/values-ms/strings.xml +++ b/go/quickstep/res/values-ms/strings.xml @@ -4,7 +4,7 @@ "Kongsi Apl" "Dengar" "Terjemah" - "Kanta" + "Lens" "OK" "BATAL" "TETAPAN" diff --git a/go/quickstep/res/values-ta/strings.xml b/go/quickstep/res/values-ta/strings.xml index 9d04e9a72c..cd97aa3c7a 100644 --- a/go/quickstep/res/values-ta/strings.xml +++ b/go/quickstep/res/values-ta/strings.xml @@ -4,7 +4,7 @@ "ஆப்ஸைப் பகிருங்கள்" "கேளுங்கள்" "மொழிபெயர்" - "லென்ஸ்" + "Lens" "சரி" "ரத்துசெய்" "அமைப்புகள்" diff --git a/go/quickstep/res/values-zu/strings.xml b/go/quickstep/res/values-zu/strings.xml index d496b6442d..1be7898a4b 100644 --- a/go/quickstep/res/values-zu/strings.xml +++ b/go/quickstep/res/values-zu/strings.xml @@ -4,7 +4,7 @@ "Yabelana nge-App" "Lalela" "Humusha" - "Ilensi" + "Lens" "NGIYITHOLILE" "KHANSELA" "AMASETHINGI" diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto index a61e430d37..41276507ab 100644 --- a/protos/launcher_atom.proto +++ b/protos/launcher_atom.proto @@ -121,6 +121,7 @@ message TaskBarContainer { optional int32 cardinality = 2; } +// Next value 39 enum Attribute { UNKNOWN = 0; DEFAULT_LAYOUT = 1; // icon automatically placed in workspace, folder, hotseat @@ -166,11 +167,13 @@ enum Attribute { ALL_APPS_SEARCH_RESULT_ASSISTANT_MEMORY = 31; // Suggestion Type provided by AGA - ONE_SEARCH_WEB_QUERY = 32; - ONE_SEARCH_WEB_TRENDING = 33; - ONE_SEARCH_WEB_ENTITY = 34; - ONE_SEARCH_WEB_ANSWER = 35; - ONE_SEARCH_WEB_PERSONAL = 36; + WEB_SEARCH_RESULT_QUERY = 32; + WEB_SEARCH_RESULT_TRENDING = 33; + WEB_SEARCH_RESULT_ENTITY = 34; + WEB_SEARCH_RESULT_ANSWER = 35; + WEB_SEARCH_RESULT_PERSONAL = 36; + WEB_SEARCH_RESULT_CALCULATOR = 37; + WEB_SEARCH_RESULT_URL = 38; WIDGETS_BOTTOM_TRAY = 28; WIDGETS_TRAY_PREDICTION = 29; diff --git a/quickstep/ext_tests/src/com/android/quickstep/DebugQuickstepTestInformationHandler.java b/quickstep/ext_tests/src/com/android/quickstep/DebugQuickstepTestInformationHandler.java new file mode 100644 index 0000000000..e5f0295ff6 --- /dev/null +++ b/quickstep/ext_tests/src/com/android/quickstep/DebugQuickstepTestInformationHandler.java @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2022 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 static com.android.launcher3.util.Executors.MAIN_EXECUTOR; + +import android.content.Context; +import android.content.res.Resources; +import android.os.Bundle; + +import androidx.annotation.Nullable; + +import com.android.launcher3.BaseQuickstepLauncher; +import com.android.launcher3.Launcher; +import com.android.launcher3.R; +import com.android.launcher3.taskbar.LauncherTaskbarUIController; +import com.android.launcher3.testing.DebugTestInformationHandler; +import com.android.launcher3.testing.TestProtocol; + +import java.util.concurrent.ExecutionException; + +/** + * Class to handle requests from tests, including debug ones, to Quickstep Launcher builds. + */ +public abstract class DebugQuickstepTestInformationHandler extends QuickstepTestInformationHandler { + + private final DebugTestInformationHandler mDebugTestInformationHandler; + + public DebugQuickstepTestInformationHandler(Context context) { + super(context); + mDebugTestInformationHandler = new DebugTestInformationHandler(context); + } + + @Override + public Bundle call(String method, String arg, @Nullable Bundle extras) { + Bundle response = new Bundle(); + switch (method) { + case TestProtocol.REQUEST_ENABLE_MANUAL_TASKBAR_STASHING: + runOnUIThread(l -> { + enableManualTaskbarStashing(l, true); + }); + return response; + + case TestProtocol.REQUEST_DISABLE_MANUAL_TASKBAR_STASHING: + runOnUIThread(l -> { + enableManualTaskbarStashing(l, false); + }); + return response; + + case TestProtocol.REQUEST_UNSTASH_TASKBAR_IF_STASHED: + runOnUIThread(l -> { + enableManualTaskbarStashing(l, true); + + BaseQuickstepLauncher quickstepLauncher = (BaseQuickstepLauncher) l; + LauncherTaskbarUIController taskbarUIController = + quickstepLauncher.getTaskbarUIController(); + + // Allow null-pointer to catch illegal states. + taskbarUIController.unstashTaskbarIfStashed(); + + enableManualTaskbarStashing(l, false); + }); + return response; + + case TestProtocol.REQUEST_STASHED_TASKBAR_HEIGHT: { + final Resources resources = mContext.getResources(); + response.putInt(TestProtocol.TEST_INFO_RESPONSE_FIELD, + resources.getDimensionPixelSize(R.dimen.taskbar_stashed_size)); + return response; + } + + default: + response = super.call(method, arg, extras); + if (response != null) return response; + return mDebugTestInformationHandler.call(method, arg, extras); + } + } + + private void enableManualTaskbarStashing(Launcher launcher, boolean enable) { + BaseQuickstepLauncher quickstepLauncher = (BaseQuickstepLauncher) launcher; + LauncherTaskbarUIController taskbarUIController = + quickstepLauncher.getTaskbarUIController(); + + // Allow null-pointer to catch illegal states. + taskbarUIController.enableManualStashingForTests(enable); + } + + /** + * Runs the given command on the UI thread. + */ + private static void runOnUIThread(UIThreadCommand command) { + try { + MAIN_EXECUTOR.submit(() -> { + command.execute(Launcher.ACTIVITY_TRACKER.getCreatedActivity()); + return null; + }).get(); + } catch (ExecutionException | InterruptedException e) { + throw new RuntimeException(e); + } + } + + private interface UIThreadCommand { + + void execute(Launcher launcher); + } +} + diff --git a/quickstep/res/drawable-v28/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable-v28/gesture_tutorial_action_button_background.xml index 57423c2ffc..710482f162 100644 --- a/quickstep/res/drawable-v28/gesture_tutorial_action_button_background.xml +++ b/quickstep/res/drawable-v28/gesture_tutorial_action_button_background.xml @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/quickstep/res/drawable/bg_sandbox_feedback.xml b/quickstep/res/drawable/bg_sandbox_feedback.xml index 83a3deada8..83d7e4396c 100644 --- a/quickstep/res/drawable/bg_sandbox_feedback.xml +++ b/quickstep/res/drawable/bg_sandbox_feedback.xml @@ -14,7 +14,8 @@ limitations under the License. --> - + diff --git a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml index ac6a52a623..98dc1a5f78 100644 --- a/quickstep/res/drawable/gesture_tutorial_action_button_background.xml +++ b/quickstep/res/drawable/gesture_tutorial_action_button_background.xml @@ -25,7 +25,7 @@ - + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml index 0a34af6475..77626154f8 100644 --- a/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml +++ b/quickstep/res/drawable/gesture_tutorial_cancel_button_background.xml @@ -17,5 +17,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_finger_dot.xml b/quickstep/res/drawable/gesture_tutorial_finger_dot.xml index 5f8aafd30a..cbb26122db 100644 --- a/quickstep/res/drawable/gesture_tutorial_finger_dot.xml +++ b/quickstep/res/drawable/gesture_tutorial_finger_dot.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/quickstep/res/drawable/gesture_tutorial_loop_back.xml b/quickstep/res/drawable/gesture_tutorial_loop_back.xml index d2909fffc9..ae47709b22 100644 --- a/quickstep/res/drawable/gesture_tutorial_loop_back.xml +++ b/quickstep/res/drawable/gesture_tutorial_loop_back.xml @@ -85,7 +85,7 @@ diff --git a/quickstep/res/drawable/gesture_tutorial_loop_home.xml b/quickstep/res/drawable/gesture_tutorial_loop_home.xml index 931f8c0197..bed35dd0fa 100644 --- a/quickstep/res/drawable/gesture_tutorial_loop_home.xml +++ b/quickstep/res/drawable/gesture_tutorial_loop_home.xml @@ -81,7 +81,7 @@ diff --git a/quickstep/res/drawable/gesture_tutorial_loop_overview.xml b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml index a4c532bdfa..53e8b5fec5 100644 --- a/quickstep/res/drawable/gesture_tutorial_loop_overview.xml +++ b/quickstep/res/drawable/gesture_tutorial_loop_overview.xml @@ -81,7 +81,7 @@ diff --git a/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml b/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml new file mode 100644 index 0000000000..20d2ecc59f --- /dev/null +++ b/quickstep/res/layout-land/gesture_tutorial_mock_hotseat.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml b/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml new file mode 100644 index 0000000000..6877b89716 --- /dev/null +++ b/quickstep/res/layout-land/gesture_tutorial_tablet_mock_hotseat.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml index 9ad10dc54e..0cae733dbe 100644 --- a/quickstep/res/layout/activity_allset.xml +++ b/quickstep/res/layout/activity_allset.xml @@ -60,7 +60,7 @@ + android:gravity="start"/> + + android:paddingStart="@dimen/gesture_tutorial_hotseat_padding_start_end" + android:paddingEnd="@dimen/gesture_tutorial_hotseat_padding_start_end"> + android:layout_width="@dimen/gesture_tutorial_hotseat_width" + android:layout_height="@dimen/gesture_tutorial_hotseat_height"/> @@ -102,7 +100,7 @@ android:background="@drawable/gesture_tutorial_ripple"/> - - + + \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_mock_conversation.xml b/quickstep/res/layout/gesture_tutorial_mock_conversation.xml index e8d5d79a58..5550389e25 100644 --- a/quickstep/res/layout/gesture_tutorial_mock_conversation.xml +++ b/quickstep/res/layout/gesture_tutorial_mock_conversation.xml @@ -34,8 +34,8 @@ android:layout_height="0dp" android:layout_marginTop="43dp" android:layout_marginBottom="22dp" - android:layout_marginStart="34dp" - android:layout_marginEnd="211dp" + android:layout_marginStart="@dimen/gesture_tutorial_top_bar_margin_start" + android:layout_marginEnd="@dimen/gesture_tutorial_top_bar_margin_end" app:cardElevation="0dp" app:cardCornerRadius="4dp" @@ -84,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:background="@color/mock_conversation_background" - android:paddingBottom="66dp" + android:paddingBottom="@dimen/gesture_tutorial_conversation_bottom_padding" app:layout_constraintTop_toBottomOf="@id/top_bar" app:layout_constraintBottom_toBottomOf="parent" @@ -108,6 +108,7 @@ android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom" android:layout_marginStart="124dp" android:layout_marginEnd="@dimen/gesture_tutorial_message_padding_end" + android:visibility="@integer/gesture_tutorial_extra_messages_visibility" app:cardElevation="0dp" app:cardCornerRadius="18dp" @@ -122,6 +123,7 @@ android:layout_height="@dimen/gesture_tutorial_message_icon_size" android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom" android:layout_marginStart="@dimen/gesture_tutorial_message_padding_start" + android:visibility="@integer/gesture_tutorial_extra_messages_visibility" app:cardElevation="0dp" app:cardCornerRadius="@dimen/gesture_tutorial_message_icon_corner_radius" @@ -135,6 +137,7 @@ android:layout_height="36dp" android:layout_marginStart="17dp" android:layout_marginEnd="112dp" + android:visibility="@integer/gesture_tutorial_extra_messages_visibility" app:cardElevation="0dp" app:cardCornerRadius="18dp" @@ -151,6 +154,7 @@ android:layout_marginBottom="@dimen/gesture_tutorial_message_small_margin_bottom" android:layout_marginStart="280dp" android:layout_marginEnd="@dimen/gesture_tutorial_message_padding_end" + android:visibility="@integer/gesture_tutorial_extra_messages_visibility" app:cardElevation="0dp" app:cardCornerRadius="18dp" @@ -164,7 +168,7 @@ android:layout_width="0dp" android:layout_height="74dp" android:layout_marginBottom="@dimen/gesture_tutorial_message_large_margin_bottom" - android:layout_marginStart="124dp" + android:layout_marginStart="@dimen/gesture_tutorial_message_margin_start" android:layout_marginEnd="@dimen/gesture_tutorial_message_padding_end" app:cardElevation="0dp" @@ -192,7 +196,7 @@ android:layout_width="0dp" android:layout_height="36dp" android:layout_marginStart="17dp" - android:layout_marginEnd="144dp" + android:layout_marginEnd="@dimen/gesture_tutorial_reply_margin_end" app:cardElevation="0dp" app:cardCornerRadius="18dp" @@ -206,7 +210,7 @@ android:id="@+id/message_4" android:layout_width="0dp" android:layout_height="74dp" - android:layout_marginStart="124dp" + android:layout_marginStart="@dimen/gesture_tutorial_message_margin_start" android:layout_marginEnd="@dimen/gesture_tutorial_message_padding_end" app:cardElevation="0dp" diff --git a/quickstep/res/layout/gesture_tutorial_mock_conversation_list.xml b/quickstep/res/layout/gesture_tutorial_mock_conversation_list.xml index 364ad6d17d..a172ad3712 100644 --- a/quickstep/res/layout/gesture_tutorial_mock_conversation_list.xml +++ b/quickstep/res/layout/gesture_tutorial_mock_conversation_list.xml @@ -35,7 +35,7 @@ android:layout_marginTop="43dp" android:layout_marginBottom="22dp" android:layout_marginStart="34dp" - android:layout_marginEnd="35dp" + android:layout_marginEnd="34dp" app:cardElevation="0dp" app:cardCornerRadius="4dp" @@ -51,337 +51,336 @@ android:layout_width="match_parent" android:layout_height="0dp" android:background="@color/mock_list_background" - android:paddingBottom="66dp" + android:paddingTop="@dimen/gesture_tutorial_conversation_list_padding_top" + android:paddingStart="26dp" app:layout_constraintTop_toBottomOf="@id/top_bar" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent"> - + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_1" + app:layout_constraintStart_toEndOf="@id/conversation_icon_1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_2"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_1" + app:layout_constraintStart_toEndOf="@id/conversation_icon_1" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_1"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_1" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_2" + app:layout_constraintStart_toEndOf="@id/conversation_icon_2" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_4"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_3" + app:layout_constraintStart_toEndOf="@id/conversation_icon_2" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_2"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_2" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_3" + app:layout_constraintStart_toEndOf="@id/conversation_icon_3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_6"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_5" + app:layout_constraintStart_toEndOf="@id/conversation_icon_3" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_3"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_3" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_4" + app:layout_constraintStart_toEndOf="@id/conversation_icon_4" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_8"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_7" + app:layout_constraintStart_toEndOf="@id/conversation_icon_4" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_4"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_4" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_5" + app:layout_constraintStart_toEndOf="@id/conversation_icon_5" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_10"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_9" + app:layout_constraintStart_toEndOf="@id/conversation_icon_5" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_5"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_5" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_6" + app:layout_constraintStart_toEndOf="@id/conversation_icon_6" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_12"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_11" + app:layout_constraintStart_toEndOf="@id/conversation_icon_6" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_6"/> - + app:cardElevation="0dp" + app:cardCornerRadius="@dimen/gesture_tutorial_conversation_icon_corner_radius" + app:cardBackgroundColor="@color/mock_list_profile_icon" + app:layout_constraintTop_toBottomOf="@id/conversation_icon_6" + app:layout_constraintStart_toStartOf="parent"/> - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintVertical_chainStyle="packed" + app:layout_constraintTop_toTopOf="@id/conversation_icon_7" + app:layout_constraintStart_toEndOf="@id/conversation_icon_7" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@id/conversation_line_14"/> - - - - - + app:cardElevation="0dp" + app:cardCornerRadius="4dp" + app:cardBackgroundColor="@color/mock_list_preview_message" + app:layout_constraintTop_toBottomOf="@id/conversation_line_13" + app:layout_constraintStart_toEndOf="@id/conversation_icon_7" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@id/conversation_icon_7"/> + app:layout_constraintEnd_toEndOf="parent"> + + - - \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_tablet_mock_hotseat.xml b/quickstep/res/layout/gesture_tutorial_tablet_mock_hotseat.xml new file mode 100644 index 0000000000..027e4a05b0 --- /dev/null +++ b/quickstep/res/layout/gesture_tutorial_tablet_mock_hotseat.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/quickstep/res/layout/gesture_tutorial_foldable_mock_taskbar.xml b/quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml similarity index 100% rename from quickstep/res/layout/gesture_tutorial_foldable_mock_taskbar.xml rename to quickstep/res/layout/gesture_tutorial_tablet_mock_taskbar.xml diff --git a/quickstep/res/layout/gesture_tutorial_foldable_mock_webpage.xml b/quickstep/res/layout/gesture_tutorial_tablet_mock_webpage.xml similarity index 100% rename from quickstep/res/layout/gesture_tutorial_foldable_mock_webpage.xml rename to quickstep/res/layout/gesture_tutorial_tablet_mock_webpage.xml diff --git a/quickstep/res/layout/predicted_hotseat_edu.xml b/quickstep/res/layout/predicted_hotseat_edu.xml index e4e3956c6e..f0c12f1029 100644 --- a/quickstep/res/layout/predicted_hotseat_edu.xml +++ b/quickstep/res/layout/predicted_hotseat_edu.xml @@ -42,6 +42,7 @@ android:paddingLeft="@dimen/bottom_sheet_edu_padding" android:paddingRight="@dimen/bottom_sheet_edu_padding" android:text="@string/hotseat_edu_title_migrate" + android:fontFamily="google-sans" android:textAlignment="center" android:textColor="@android:color/white" android:textSize="20sp" /> diff --git a/quickstep/res/layout/taskbar_all_apps.xml b/quickstep/res/layout/taskbar_all_apps.xml index 7dc0cbe1ab..d402469833 100644 --- a/quickstep/res/layout/taskbar_all_apps.xml +++ b/quickstep/res/layout/taskbar_all_apps.xml @@ -51,6 +51,12 @@ + + diff --git a/quickstep/res/values-af/strings.xml b/quickstep/res/values-af/strings.xml index ac10cc8d92..1b3f1cd384 100644 --- a/quickstep/res/values-af/strings.xml +++ b/quickstep/res/values-af/strings.xml @@ -76,6 +76,7 @@ "Gereed!" "Swiep op om na die tuisskerm toe te gaan" "Jy is gereed om jou foon te begin gebruik" + "Jy is gereed om jou tablet te begin gebruik" "Stelselnavigasie-instellings" "Deel" "Skermkiekie" diff --git a/quickstep/res/values-am/strings.xml b/quickstep/res/values-am/strings.xml index dfa8532870..6daa895e3b 100644 --- a/quickstep/res/values-am/strings.xml +++ b/quickstep/res/values-am/strings.xml @@ -76,6 +76,7 @@ "ሁሉም ዝግጁ!" "ወደ መነሻ ለመሄድ በጣት ወደ ላይ ማንሸራተት" "ስልክዎን መጠቀም ለመጀመር ዝግጁ ነዎት" + "ጡባዊዎን መጠቀም ለመጀመር ዝግጁ ነዎት" "የስርዓት አሰሳ ቅንብሮች" "አጋራ" "ቅጽበታዊ ገጽ እይታ" diff --git a/quickstep/res/values-ar/strings.xml b/quickstep/res/values-ar/strings.xml index 5deea3b6fd..fe9af1891c 100644 --- a/quickstep/res/values-ar/strings.xml +++ b/quickstep/res/values-ar/strings.xml @@ -76,6 +76,7 @@ "اكتملت عملية الإعداد" "مرِّر سريعًا للأعلى للانتقال إلى الشاشة الرئيسية." "يمكنك الآن بدء استخدام هاتفك." + "يمكنك الآن بدء استخدام جهازك اللوحي." "إعدادات التنقّل داخل النظام" "مشاركة" "لقطة شاشة" diff --git a/quickstep/res/values-as/strings.xml b/quickstep/res/values-as/strings.xml index d48c2f1793..a6a7e38bff 100644 --- a/quickstep/res/values-as/strings.xml +++ b/quickstep/res/values-as/strings.xml @@ -76,6 +76,7 @@ "সকলো সাজু!" "গৃহ স্ক্ৰীনলৈ যাবলৈ ওপৰলৈ ছোৱাইপ কৰক" "আপুনি আপোনাৰ ফ’নটো ব্যৱহাৰ কৰিবলৈ সাজু" + "আপুনি আপোনাৰ টেবলেটটো ব্যৱহাৰ কৰিবলৈ সাজু" "ছিষ্টেম নেভিগেশ্বনৰ ছেটিং" "শ্বেয়াৰ কৰক" "স্ক্ৰীনশ্বট" diff --git a/quickstep/res/values-az/strings.xml b/quickstep/res/values-az/strings.xml index 9cea3c6b7a..3650658f89 100644 --- a/quickstep/res/values-az/strings.xml +++ b/quickstep/res/values-az/strings.xml @@ -76,6 +76,7 @@ "Hər şey hazırdır!" "Əsas səhifəyə keçmək üçün yuxarı çəkin" "Telefondan istifadəyə başlamağa hazırsınız" + "Planşetdən istifadəyə başlamağa hazırsınız" "Sistem naviqasiya ayarları" "Paylaşın" "Skrinşot" diff --git a/quickstep/res/values-b+sr+Latn/strings.xml b/quickstep/res/values-b+sr+Latn/strings.xml index f495b00cbe..6af2f1f6ea 100644 --- a/quickstep/res/values-b+sr+Latn/strings.xml +++ b/quickstep/res/values-b+sr+Latn/strings.xml @@ -76,6 +76,7 @@ "Gotovo!" "Prevucite nagore da biste otvorili početni ekran" "Spremni ste da počnete da koristite telefon" + "Spremni ste da počnete da koristite tablet" "Podešavanja kretanja kroz sistem" "Deli" "Snimak ekrana" diff --git a/quickstep/res/values-be/strings.xml b/quickstep/res/values-be/strings.xml index 16aec9b6de..a4cdfdc042 100644 --- a/quickstep/res/values-be/strings.xml +++ b/quickstep/res/values-be/strings.xml @@ -76,6 +76,7 @@ "Гатова!" "Каб перайсці на галоўны экран, правядзіце пальцам уверх" "Вы можаце пачаць карыстанне тэлефонам" + "Вы можаце пачаць карыстанне планшэтам" "Налады навігацыі ў сістэме" "Абагуліць" "Здымак экрана" diff --git a/quickstep/res/values-bg/strings.xml b/quickstep/res/values-bg/strings.xml index 2d3dc60116..e5eedbb3c1 100644 --- a/quickstep/res/values-bg/strings.xml +++ b/quickstep/res/values-bg/strings.xml @@ -76,6 +76,7 @@ "Готово!" "Прекарайте пръст нагоре, за да отворите началния екран" "Можете да започнете да използвате телефона си" + "Можете да започнете да използвате таблета си" "Настройки за навигиране в системата" "Споделяне" "Екранна снимка" diff --git a/quickstep/res/values-bn/strings.xml b/quickstep/res/values-bn/strings.xml index ddd0edd77e..1d9d3d4bbb 100644 --- a/quickstep/res/values-bn/strings.xml +++ b/quickstep/res/values-bn/strings.xml @@ -76,6 +76,7 @@ "সব রেডি!" "হোম স্ক্রিনে যেতে উপরের দিকে সোয়াইপ করুন" "এবারে আপনি ফোন ব্যবহার করতে পারবেন" + "এবারে আপনি ট্যাবলেট ব্যবহার করতে পারবেন" "সিস্টেম নেভিগেশন সেটিংস" "শেয়ার করুন" "স্ক্রিনশট নিন" diff --git a/quickstep/res/values-bs/strings.xml b/quickstep/res/values-bs/strings.xml index 2cf2ef4878..5906ac8b93 100644 --- a/quickstep/res/values-bs/strings.xml +++ b/quickstep/res/values-bs/strings.xml @@ -76,6 +76,7 @@ "Sve je spremno!" "Prevucite prema gore da odete na početnu stranicu" "Sve je spremno da počnete koristiti telefon" + "Sve je spremno da počnete koristiti tablet" "Postavke navigiranja sistemom" "Dijeli" "Snimak ekrana" diff --git a/quickstep/res/values-ca/strings.xml b/quickstep/res/values-ca/strings.xml index 8a6d1534eb..da445ab385 100644 --- a/quickstep/res/values-ca/strings.xml +++ b/quickstep/res/values-ca/strings.xml @@ -76,6 +76,7 @@ "Tot a punt!" "Llisca cap amunt per anar a la pàgina d\'inici" "Ja pots començar a utilitzar el telèfon" + "Ja pots començar a utilitzar la tauleta" "Configuració de navegació del sistema" "Comparteix" "Captura de pantalla" diff --git a/quickstep/res/values-cs/strings.xml b/quickstep/res/values-cs/strings.xml index c2071033e9..83c92bdb8f 100644 --- a/quickstep/res/values-cs/strings.xml +++ b/quickstep/res/values-cs/strings.xml @@ -76,6 +76,7 @@ "Hotovo!" "Přejetím nahoru se vrátíte na plochu" "Jste připraveni začít používat telefon" + "Jste připraveni začít používat tablet" "Nastavení navigace v systému" "Sdílet" "Snímek obrazovky" diff --git a/quickstep/res/values-da/strings.xml b/quickstep/res/values-da/strings.xml index e53dfb0e5b..fe069d7e30 100644 --- a/quickstep/res/values-da/strings.xml +++ b/quickstep/res/values-da/strings.xml @@ -76,6 +76,7 @@ "Alt er parat!" "Stryg opad for at gå til startsiden" "Du er klar til at bruge din telefon" + "Du er klar til at bruge din tablet" "Indstillinger for systemnavigation" "Del" "Screenshot" diff --git a/quickstep/res/values-de/strings.xml b/quickstep/res/values-de/strings.xml index 8d5aa7a07d..24a25f5003 100644 --- a/quickstep/res/values-de/strings.xml +++ b/quickstep/res/values-de/strings.xml @@ -76,6 +76,7 @@ "Fertig!" "Nach oben wischen, um den Startbildschirm aufzurufen" "Du kannst dein Smartphone jetzt verwenden" + "Du kannst dein Tablet jetzt verwenden" "Einstellungen der Systemsteuerung" "Teilen" "Screenshot" diff --git a/quickstep/res/values-el/strings.xml b/quickstep/res/values-el/strings.xml index 10c39b40d9..3c24a13eef 100644 --- a/quickstep/res/values-el/strings.xml +++ b/quickstep/res/values-el/strings.xml @@ -76,6 +76,7 @@ "Όλα έτοιμα!" "Σύρετε προς τα πάνω για μετάβαση στην αρχική οθόνη." "Είστε έτοιμοι να ξεκινήσετε να χρησιμοποιείτε το τηλέφωνό σας" + "Είστε έτοιμοι να ξεκινήσετε να χρησιμοποιείτε το tablet." "Ρυθμίσεις πλοήγησης συστήματος" "Κοινοποίηση" "Στιγμιότυπο οθόνης" diff --git a/quickstep/res/values-en-rAU/strings.xml b/quickstep/res/values-en-rAU/strings.xml index c67f4c92a7..88a2c67252 100644 --- a/quickstep/res/values-en-rAU/strings.xml +++ b/quickstep/res/values-en-rAU/strings.xml @@ -76,6 +76,7 @@ "Ready!" "Swipe up to go home" "You’re ready to start using your phone" + "You’re ready to start using your tablet" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rCA/strings.xml b/quickstep/res/values-en-rCA/strings.xml index c67f4c92a7..88a2c67252 100644 --- a/quickstep/res/values-en-rCA/strings.xml +++ b/quickstep/res/values-en-rCA/strings.xml @@ -76,6 +76,7 @@ "Ready!" "Swipe up to go home" "You’re ready to start using your phone" + "You’re ready to start using your tablet" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rGB/strings.xml b/quickstep/res/values-en-rGB/strings.xml index c67f4c92a7..88a2c67252 100644 --- a/quickstep/res/values-en-rGB/strings.xml +++ b/quickstep/res/values-en-rGB/strings.xml @@ -76,6 +76,7 @@ "Ready!" "Swipe up to go home" "You’re ready to start using your phone" + "You’re ready to start using your tablet" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rIN/strings.xml b/quickstep/res/values-en-rIN/strings.xml index c67f4c92a7..88a2c67252 100644 --- a/quickstep/res/values-en-rIN/strings.xml +++ b/quickstep/res/values-en-rIN/strings.xml @@ -76,6 +76,7 @@ "Ready!" "Swipe up to go home" "You’re ready to start using your phone" + "You’re ready to start using your tablet" "System navigation settings" "Share" "Screenshot" diff --git a/quickstep/res/values-en-rXC/strings.xml b/quickstep/res/values-en-rXC/strings.xml index c3007f04e0..1ad2874e4c 100644 --- a/quickstep/res/values-en-rXC/strings.xml +++ b/quickstep/res/values-en-rXC/strings.xml @@ -76,6 +76,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎All set!‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎Swipe up to go Home‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎You’re ready to start using your phone‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎You’re ready to start using your tablet‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎System navigation settings‎‏‎‎‏‏‎""‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎Share‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎Screenshot‎‏‎‎‏‎" diff --git a/quickstep/res/values-es-rUS/strings.xml b/quickstep/res/values-es-rUS/strings.xml index 69b6015a2a..5c29ff893f 100644 --- a/quickstep/res/values-es-rUS/strings.xml +++ b/quickstep/res/values-es-rUS/strings.xml @@ -76,6 +76,7 @@ "Todo listo" "Desliza el dedo hacia arriba para ir a la pantalla principal" "Ya puedes empezar a usar tu teléfono" + "Ya puedes empezar a usar tu tablet" "Configuración de navegación del sistema" "Compartir" "Captura de pantalla" diff --git a/quickstep/res/values-es/strings.xml b/quickstep/res/values-es/strings.xml index 0916fc23ed..7f60601e6f 100644 --- a/quickstep/res/values-es/strings.xml +++ b/quickstep/res/values-es/strings.xml @@ -76,6 +76,7 @@ "¡Ya está!" "Desliza el dedo hacia arriba para ir a la pantalla de inicio" "Ya puedes empezar a usar tu teléfono" + "Ya puedes empezar a usar tu tablet" "Ajustes de navegación del sistema" "Compartir" "Hacer captura" diff --git a/quickstep/res/values-et/strings.xml b/quickstep/res/values-et/strings.xml index 5b4b1ce6f0..5d88a75afb 100644 --- a/quickstep/res/values-et/strings.xml +++ b/quickstep/res/values-et/strings.xml @@ -76,6 +76,7 @@ "Valmis!" "Avakuvale liikumiseks pühkige üles" "Olete valmis oma telefoni kasutama." + "Olete valmis oma tahvelarvutit kasutama" "Süsteemi navigeerimisseaded" "Jaga" "Ekraanipilt" diff --git a/quickstep/res/values-eu/strings.xml b/quickstep/res/values-eu/strings.xml index 6193e359fd..077cb0237d 100644 --- a/quickstep/res/values-eu/strings.xml +++ b/quickstep/res/values-eu/strings.xml @@ -76,6 +76,7 @@ "Dena prest!" "Pasatu hatza gora hasierako pantailara joateko" "Prest zaude telefonoa erabiltzen hasteko" + "Prest zaude tableta erabiltzen hasteko" "Sisteman nabigatzeko ezarpenak" "Partekatu" "Atera pantaila-argazki bat" diff --git a/quickstep/res/values-fa/strings.xml b/quickstep/res/values-fa/strings.xml index 2323b3b657..380e412dee 100644 --- a/quickstep/res/values-fa/strings.xml +++ b/quickstep/res/values-fa/strings.xml @@ -76,6 +76,7 @@ "همه چیز آماده است!" "برای رفتن به «صفحه اصلی»، تند به‌بالا بکشید" "آماده‌اید از تلفنتان استفاده کنید" + "آماده‌اید از رایانه لوحی‌تان استفاده کنید" "تنظیمات پیمایش سیستم" "هم‌رسانی" "نماگرفت" diff --git a/quickstep/res/values-fi/strings.xml b/quickstep/res/values-fi/strings.xml index 4677edab9b..d74cfb7303 100644 --- a/quickstep/res/values-fi/strings.xml +++ b/quickstep/res/values-fi/strings.xml @@ -76,6 +76,7 @@ "Valmis" "Siirry aloitusnäytölle pyyhkäisemällä ylös" "Olet valmis aloittamaan puhelimen käytön" + "Olet valmis aloittamaan tabletin käytön" "Järjestelmän navigointiasetukset" "Jaa" "Kuvakaappaus" diff --git a/quickstep/res/values-fr-rCA/strings.xml b/quickstep/res/values-fr-rCA/strings.xml index 2a38ff862d..447d483b37 100644 --- a/quickstep/res/values-fr-rCA/strings.xml +++ b/quickstep/res/values-fr-rCA/strings.xml @@ -76,6 +76,7 @@ "Tout est prêt!" "Balayez l\'écran vers le haut pour accéder à l\'écran d\'accueil" "Vous êtes maintenant prêt à utiliser votre téléphone" + "Vous êtes maintenant prêt à utiliser votre tablette" "Paramètres de navigation du système" "Partager" "Capture d\'écran" diff --git a/quickstep/res/values-fr/strings.xml b/quickstep/res/values-fr/strings.xml index c1dd76e6ea..6fd340174b 100644 --- a/quickstep/res/values-fr/strings.xml +++ b/quickstep/res/values-fr/strings.xml @@ -76,6 +76,7 @@ "Tout est prêt !" "Balayez l\'écran vers le haut pour revenir à l\'accueil" "Vous pouvez maintenant utiliser votre téléphone" + "Vous pouvez maintenant utiliser votre tablette" "Paramètres de navigation système" "Partager" "Capture d\'écran" diff --git a/quickstep/res/values-gl/strings.xml b/quickstep/res/values-gl/strings.xml index 8702947875..f409e47ca3 100644 --- a/quickstep/res/values-gl/strings.xml +++ b/quickstep/res/values-gl/strings.xml @@ -76,6 +76,7 @@ "Todo listo" "Pasa o dedo cara arriba para ir á pantalla de inicio" "Todo está listo para comezar a utilizar o teléfono" + "Todo está listo para comezar a utilizar a tableta" "Configuración da navegación do sistema" "Compartir" "Facer captura" diff --git a/quickstep/res/values-gu/strings.xml b/quickstep/res/values-gu/strings.xml index 6bb100a060..c8c488e221 100644 --- a/quickstep/res/values-gu/strings.xml +++ b/quickstep/res/values-gu/strings.xml @@ -76,6 +76,7 @@ "બધું સેટ થઈ ગયું!" "હોમપેજ પર જવા માટે ઉપરની તરફ સ્વાઇપ કરો" "તમે તમારા ફોનનો ઉપયોગ કરવા માટે તૈયાર છો" + "તમે તમારા ટૅબ્લેટનો ઉપયોગ કરવા માટે તૈયાર છો" "સિસ્ટમના નૅવિગેશન સેટિંગ" "શેર કરો" "સ્ક્રીનશૉટ" diff --git a/quickstep/res/values-hi/strings.xml b/quickstep/res/values-hi/strings.xml index 957125a54c..bfdc7e3a71 100644 --- a/quickstep/res/values-hi/strings.xml +++ b/quickstep/res/values-hi/strings.xml @@ -76,6 +76,7 @@ "हो गया!" "होम स्क्रीन पर जाने के लिए, ऊपर की ओर स्वाइप करें" "अब आप अपना फ़ोन इस्तेमाल कर सकते हैं" + "आप टैबलेट को इस्तेमाल करने के लिए तैयार हैं" "सिस्टम नेविगेशन सेटिंग" "शेयर करें" "स्क्रीनशॉट लें" diff --git a/quickstep/res/values-hr/strings.xml b/quickstep/res/values-hr/strings.xml index 6c29822c69..41e792283d 100644 --- a/quickstep/res/values-hr/strings.xml +++ b/quickstep/res/values-hr/strings.xml @@ -76,6 +76,7 @@ "Sve je spremno!" "Prijeđite prstom prema gore da biste otvorili početni zaslon" "Spremni ste za početak upotrebe telefona" + "Spremni ste za početak upotrebe tableta" "Postavke navigacije sustavom" "Podijeli" "Snimka zaslona" diff --git a/quickstep/res/values-hu/strings.xml b/quickstep/res/values-hu/strings.xml index a84dadd706..fb90e0905d 100644 --- a/quickstep/res/values-hu/strings.xml +++ b/quickstep/res/values-hu/strings.xml @@ -76,6 +76,7 @@ "Kész is!" "Felfelé csúsztatva megjelenik a Kezdőképernyő" "Készen áll a telefon használatára" + "Készen áll a táblagép használatára" "Rendszer-navigációs beállítások" "Megosztás" "Képernyőkép" diff --git a/quickstep/res/values-hy/strings.xml b/quickstep/res/values-hy/strings.xml index df7307834a..1b9d1e5ace 100644 --- a/quickstep/res/values-hy/strings.xml +++ b/quickstep/res/values-hy/strings.xml @@ -76,6 +76,7 @@ "Պատրաստ է" "Մատը սահեցրեք վերև՝ հիմնական էկրան անցնելու համար" "Դուք արդեն կարող եք օգտագործել ձեր հեռախոսը" + "Դուք արդեն կարող եք օգտագործել ձեր պլանշետը" "Նավիգացիայի համակարգային կարգավորումներ" "Կիսվել" "Սքրինշոթ անել" diff --git a/quickstep/res/values-in/strings.xml b/quickstep/res/values-in/strings.xml index 61bdf31432..8a11e927be 100644 --- a/quickstep/res/values-in/strings.xml +++ b/quickstep/res/values-in/strings.xml @@ -76,6 +76,7 @@ "Semua siap." "Geser ke atas untuk beralih ke Layar utama" "Anda sudah siap untuk mulai menggunakan ponsel" + "Anda sudah siap untuk mulai menggunakan tablet" "Setelan navigasi sistem" "Bagikan" "Screenshot" diff --git a/quickstep/res/values-is/strings.xml b/quickstep/res/values-is/strings.xml index f888bea9db..947e7ee06c 100644 --- a/quickstep/res/values-is/strings.xml +++ b/quickstep/res/values-is/strings.xml @@ -76,6 +76,7 @@ "Allt tilbúið!" "Strjúktu upp til að fara á heimaskjáinn" "Þú getur byrjað að nota símann" + "Þú getur byrjað að nota spjaldtölvuna" "Stillingar kerfisstjórnunar" "Deila" "Skjámynd" diff --git a/quickstep/res/values-it/strings.xml b/quickstep/res/values-it/strings.xml index 344c2a15cd..044da60d90 100644 --- a/quickstep/res/values-it/strings.xml +++ b/quickstep/res/values-it/strings.xml @@ -76,6 +76,7 @@ "Finito." "Scorri verso l\'alto per andare alla schermata Home" "Puoi iniziare a usare il tuo telefono" + "Puoi iniziare a usare il tuo tablet" "Impostazioni Navigazione del sistema" "Condividi" "Screenshot" diff --git a/quickstep/res/values-iw/strings.xml b/quickstep/res/values-iw/strings.xml index 25d92cb8ef..29951d01e1 100644 --- a/quickstep/res/values-iw/strings.xml +++ b/quickstep/res/values-iw/strings.xml @@ -76,6 +76,7 @@ "הכול מוכן!" "כדי לעבור לדף הבית, מחליקים כלפי מעלה" "הכול מוכן ואפשר להתחיל להשתמש בטלפון" + "הכול מוכן ואפשר להתחיל להשתמש בטאבלט" "הגדרות הניווט של המערכת" "שיתוף" "צילום מסך" diff --git a/quickstep/res/values-ja/strings.xml b/quickstep/res/values-ja/strings.xml index 9a4ce01544..066bd0f6c1 100644 --- a/quickstep/res/values-ja/strings.xml +++ b/quickstep/res/values-ja/strings.xml @@ -76,6 +76,7 @@ "設定完了" "ホームに移動するには上にスワイプします" "スマートフォンを使い始めることができます" + "これでタブレットが使えるようになりました" "システム ナビゲーションの設定" "共有" "スクリーンショット" diff --git a/quickstep/res/values-ka/strings.xml b/quickstep/res/values-ka/strings.xml index 250148911f..88281ecd6f 100644 --- a/quickstep/res/values-ka/strings.xml +++ b/quickstep/res/values-ka/strings.xml @@ -76,6 +76,7 @@ "მზადაა!" "მთავარ გვერდზე გადასასვლელად გადაფურცლეთ ზევით" "მზად ხართ ტელეფონის გამოსაყენებლად" + "მზად ხართ ტაბლეტის გამოსაყენებლად" "სისტემის ნავიგაციის პარამეტრები" "გაზიარება" "ეკრანის ანაბეჭდი" diff --git a/quickstep/res/values-kk/strings.xml b/quickstep/res/values-kk/strings.xml index 9d3ca2d17a..199bd2add8 100644 --- a/quickstep/res/values-kk/strings.xml +++ b/quickstep/res/values-kk/strings.xml @@ -76,6 +76,7 @@ "Бәрі дайын!" "Негізгі экранға өту үшін жоғары қарай сырғытыңыз." "Телефоныңыз пайдалануға дайын." + "Планшетіңіз пайдалануға дайын." "Навигацияның жүйелік параметрлері" "Бөлісу" "Скриншот" diff --git a/quickstep/res/values-km/strings.xml b/quickstep/res/values-km/strings.xml index e006c6af5e..c3ea1b0d08 100644 --- a/quickstep/res/values-km/strings.xml +++ b/quickstep/res/values-km/strings.xml @@ -76,6 +76,7 @@ "រួចហើយ!" "អូសឡើងលើ ដើម្បី​ទៅកាន់​អេក្រង់ដើម" "អ្នក​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរសព្ទ​របស់អ្នក​បានហើយ" + "អ្នកអាចចាប់ផ្ដើមប្រើថេប្លេតរបស់អ្នកបានហើយ" "ការកំណត់​ការរុករក​ប្រព័ន្ធ" "ចែករំលែក" "រូបថតអេក្រង់" diff --git a/quickstep/res/values-kn/strings.xml b/quickstep/res/values-kn/strings.xml index 01c7dd5bbb..d882cf0892 100644 --- a/quickstep/res/values-kn/strings.xml +++ b/quickstep/res/values-kn/strings.xml @@ -76,6 +76,7 @@ "ಎಲ್ಲವೂ ಸಿದ್ಧವಾಗಿದೆ!" "ಮುಖಪುಟಕ್ಕೆ ಹೋಗಲು ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ" "ನಿಮ್ಮ ಫೋನ್ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ದರಾಗಿರುವಿರಿ" + "ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಬಳಸುವುದನ್ನು ಪ್ರಾರಂಭಿಸಲು ನೀವು ಸಿದ್ದರಾಗಿರುವಿರಿ" "ಸಿಸ್ಟಂ ನ್ಯಾವಿಗೇಶನ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು" "ಹಂಚಿಕೊಳ್ಳಿ" "ಸ್ಕ್ರೀನ್‌ಶಾಟ್" diff --git a/quickstep/res/values-ko/strings.xml b/quickstep/res/values-ko/strings.xml index d9ff591592..9ff90d4d2b 100644 --- a/quickstep/res/values-ko/strings.xml +++ b/quickstep/res/values-ko/strings.xml @@ -76,6 +76,7 @@ "설정 완료" "위로 스와이프하여 홈으로 이동" "휴대전화를 사용할 준비가 되었습니다." + "태블릿을 사용할 준비가 되었습니다." "시스템 탐색 설정" "공유" "스크린샷" diff --git a/quickstep/res/values-ky/strings.xml b/quickstep/res/values-ky/strings.xml index c1ca8b3cc6..b3a6ca4bd8 100644 --- a/quickstep/res/values-ky/strings.xml +++ b/quickstep/res/values-ky/strings.xml @@ -76,6 +76,7 @@ "Бүттү!" "Башкы бетке өтүү үчүн экранды өйдө сүрүңүз" "Телефонуңузду колдоно берсеңиз болот" + "Планшетиңизди колдоно берсеңиз болот" "Өтүү аракетинин тутумдук жөндөөлөрү" "Бөлүшүү" "Скриншот" diff --git a/quickstep/res/values-land/dimens.xml b/quickstep/res/values-land/dimens.xml index 668aea2c9e..f233bde73a 100644 --- a/quickstep/res/values-land/dimens.xml +++ b/quickstep/res/values-land/dimens.xml @@ -16,4 +16,61 @@ --> 8dp + + + 126dp + 24dp + + + 42dp + 60dp + 42dp + 683dp + 42dp + 35dp + 2 + 505dp + 462dp + 103dp + 103dp + 345dp + 341dp + 501dp + 345dp + 373dp + + + 607dp + 460dp + 554dp + 517dp + 570dp + 336dp + 523dp + 500dp + 15dp + 72dp + 111dp + 2 + 34dp + 42dp + + + -2px + -1px + 170dp + + + 24dp + 48dp + 121dp + 355dp + 355dp + 208dp + 439dp + 311dp + 2 + + + 218dp \ No newline at end of file diff --git a/quickstep/res/values-lo/strings.xml b/quickstep/res/values-lo/strings.xml index 5c95b03951..eb2b835311 100644 --- a/quickstep/res/values-lo/strings.xml +++ b/quickstep/res/values-lo/strings.xml @@ -76,6 +76,7 @@ "ຮຽບຮ້ອຍໝົດແລ້ວ!" "ປັດຂຶ້ນເພື່ອໄປຫາໜ້າຫຼັກ" "ທ່ານພ້ອມເລີ່ມຕົ້ນໃຊ້ໂທລະສັບຂອງທ່ານແລ້ວ" + "ທ່ານພ້ອມເລີ່ມຕົ້ນໃຊ້ແທັບເລັດຂອງທ່ານແລ້ວ" "ການຕັ້ງຄ່າການນຳທາງລະບົບ" "ແບ່ງປັນ" "ຮູບໜ້າຈໍ" diff --git a/quickstep/res/values-lt/strings.xml b/quickstep/res/values-lt/strings.xml index 8b3d2ce587..8bf7353957 100644 --- a/quickstep/res/values-lt/strings.xml +++ b/quickstep/res/values-lt/strings.xml @@ -76,6 +76,7 @@ "Paruošta!" "Perbraukite aukštyn, kad grįžtumėte į pagrindinį ekraną" "Esate pasiruošę pradėti naudoti telefoną" + "Esate pasiruošę pradėti naudoti planšetinį kompiuterį" "Sistemos naršymo nustatymai" "Bendrinti" "Ekrano kopija" diff --git a/quickstep/res/values-lv/strings.xml b/quickstep/res/values-lv/strings.xml index 99a71fbb4e..12b7afd6ae 100644 --- a/quickstep/res/values-lv/strings.xml +++ b/quickstep/res/values-lv/strings.xml @@ -76,6 +76,7 @@ "Gatavs!" "Velciet augšup, lai pārietu uz sākuma ekrānu." "Varat sākt izmantot savu tālruni" + "Varat sākt izmantot savu planšetdatoru" "Sistēmas navigācijas iestatījumi" "Kopīgot" "Veikt ekrānuzņēmumu" diff --git a/quickstep/res/values-mk/strings.xml b/quickstep/res/values-mk/strings.xml index dc0732f24c..fab6b6ed28 100644 --- a/quickstep/res/values-mk/strings.xml +++ b/quickstep/res/values-mk/strings.xml @@ -76,6 +76,7 @@ "Готово!" "Повлечете нагоре за да појдете на почетниот екран" "Спремни сте да почнете да го користите телефонот" + "Спремни сте да почнете да го користите таблетот" "Поставки за системска навигација" "Сподели" "Слика од екранот" diff --git a/quickstep/res/values-ml/strings.xml b/quickstep/res/values-ml/strings.xml index 4ac251c97d..07343f42d0 100644 --- a/quickstep/res/values-ml/strings.xml +++ b/quickstep/res/values-ml/strings.xml @@ -76,6 +76,7 @@ "എല്ലാം സജ്ജീകരിച്ചു!" "ഹോമിലേക്ക് പോകാൻ മുകളിലേക്ക് സ്വൈപ്പ് ചെയ്യുക" "ഫോൺ ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്" + "ടാബ്‌ലെറ്റ് ഉപയോഗിച്ച് തുടങ്ങാൻ നിങ്ങൾ തയ്യാറാണ്" "സിസ്‌റ്റം നാവിഗേഷൻ ക്രമീകരണം" "പങ്കിടുക" "സ്ക്രീൻഷോട്ട്" diff --git a/quickstep/res/values-mn/strings.xml b/quickstep/res/values-mn/strings.xml index 6d918f6eef..9a35b9053c 100644 --- a/quickstep/res/values-mn/strings.xml +++ b/quickstep/res/values-mn/strings.xml @@ -76,6 +76,7 @@ "Тохируулж дууслаа!" "Нүүр хуудас руу очихын тулд дээш шударна уу" "Та утсаа ашиглаж эхлэхэд бэлэн боллоо" + "Та таблетаа ашиглаж эхлэхэд бэлэн боллоо" "Системийн навигацын тохиргоо" "Хуваалцах" "Дэлгэцийн агшин дарах" diff --git a/quickstep/res/values-mr/strings.xml b/quickstep/res/values-mr/strings.xml index aa374b4fc5..d658fe3c36 100644 --- a/quickstep/res/values-mr/strings.xml +++ b/quickstep/res/values-mr/strings.xml @@ -76,6 +76,7 @@ "सर्व तयार आहे!" "होम वर जाण्यासाठी वरती स्वाइप करा" "तुम्ही तुमचा फोन वापरण्यास सुरुवात करू शकता" + "तुम्ही तुमचा टॅबलेट वापरण्यास सुरुवात करू शकता" "सिस्टम नेव्हिगेशन सेटिंग्ज" "शेअर करा" "स्क्रीनशॉट" diff --git a/quickstep/res/values-ms/strings.xml b/quickstep/res/values-ms/strings.xml index 8b9165dea6..322f00f1b4 100644 --- a/quickstep/res/values-ms/strings.xml +++ b/quickstep/res/values-ms/strings.xml @@ -76,6 +76,7 @@ "Siap!" "Leret ke atas untuk kembali ke Laman Utama" "Anda sudah sedia untuk mula menggunakan telefon anda" + "Anda bersedia untuk mula menggunakan tablet anda" "Tetapan navigasi sistem" "Kongsi" "Tangkapan skrin" diff --git a/quickstep/res/values-my/strings.xml b/quickstep/res/values-my/strings.xml index ef6052e492..df9101ec6e 100644 --- a/quickstep/res/values-my/strings.xml +++ b/quickstep/res/values-my/strings.xml @@ -76,6 +76,7 @@ "အားလုံး အဆင်သင့်ပါ။" "ပင်မစာမျက်နှာသို့သွားရန် အပေါ်သို့ ပွတ်ဆွဲပါ" "သင့်ဖုန်းကို စတင်အသုံးပြုရန် အသင့်ဖြစ်ပါပြီ" + "သင့်တက်ဘလက်ကို စသုံးရန် အသင့်ဖြစ်ပါပြီ" "စနစ် လမ်းညွှန် ဆက်တင်များ" "မျှဝေရန်" "ဖန်သားပြင်ဓာတ်ပုံ" diff --git a/quickstep/res/values-nb/strings.xml b/quickstep/res/values-nb/strings.xml index a81c779533..f4fb8fa0b0 100644 --- a/quickstep/res/values-nb/strings.xml +++ b/quickstep/res/values-nb/strings.xml @@ -76,6 +76,7 @@ "Alt er klart!" "Sveip opp for å gå til startskjermen" "Du er klar til å begynne å bruke telefonen" + "Du er klar til å begynne å bruke nettbrettet" "Innstillinger for systemnavigasjon" "Del" "Skjermdump" diff --git a/quickstep/res/values-ne/strings.xml b/quickstep/res/values-ne/strings.xml index 3c5d64fa24..b6a71b9e09 100644 --- a/quickstep/res/values-ne/strings.xml +++ b/quickstep/res/values-ne/strings.xml @@ -76,6 +76,7 @@ "सबै तयार भयो!" "होममा जान माथितिर स्वाइप गर्नुहोस्" "तपाईं आफ्नो फोन चलाउन थाल्न सक्नुहुन्छ" + "तपाईं अब आफ्नो ट्याब्लेट चलाउन थाल्न सक्नुहुन्छ" "सिस्टम नेभिगेसनसम्बन्धी सेटिङ" "सेयर गर्नुहोस्" "स्क्रिनसट" diff --git a/quickstep/res/values-nl/strings.xml b/quickstep/res/values-nl/strings.xml index 7772aae71c..4c02ea1cc7 100644 --- a/quickstep/res/values-nl/strings.xml +++ b/quickstep/res/values-nl/strings.xml @@ -76,6 +76,7 @@ "Klaar" "Swipe omhoog om naar het startscherm te gaan" "Je bent klaar om je telefoon te gebruiken" + "Je bent klaar om je tablet te gebruiken" "Navigatie-instellingen van systeem" "Delen" "Screenshot" diff --git a/quickstep/res/values-or/strings.xml b/quickstep/res/values-or/strings.xml index bb810f02f8..b76da383f8 100644 --- a/quickstep/res/values-or/strings.xml +++ b/quickstep/res/values-or/strings.xml @@ -76,6 +76,7 @@ "ସମ୍ପୂର୍ଣ୍ଣ ଭାବେ ପ୍ରସ୍ତୁତ!" "ମୂଳପୃଷ୍ଠାକୁ ଯିବା ପାଇଁ ଉପରକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ" "ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" + "ଆପଣ ଆପଣଙ୍କ ଟାବଲେଟ ବ୍ୟବହାର କରିବା ଆରମ୍ଭ କରିବାକୁ ପ୍ରସ୍ତୁତ ଅଛନ୍ତି" "ସିଷ୍ଟମ ନାଭିଗେସନ ସେଟିଂସ" "ସେୟାର୍ କରନ୍ତୁ" "ସ୍କ୍ରିନସଟ୍" diff --git a/quickstep/res/values-pa/strings.xml b/quickstep/res/values-pa/strings.xml index 0173ee2f5e..212492d261 100644 --- a/quickstep/res/values-pa/strings.xml +++ b/quickstep/res/values-pa/strings.xml @@ -76,6 +76,7 @@ "ਪੂਰੀ ਤਰ੍ਹਾਂ ਤਿਆਰ!" "ਹੋਮ \'ਤੇ ਜਾਣ ਲਈ ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ" "ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ" + "ਤੁਸੀਂ ਆਪਣਾ ਟੈਬਲੈੱਟ ਵਰਤਣ ਲਈ ਤਿਆਰ ਹੋ" "ਸਿਸਟਮ ਨੈਵੀਗੇਸ਼ਨ ਸੈਟਿੰਗਾਂ" "ਸਾਂਝਾ ਕਰੋ" "ਸਕ੍ਰੀਨਸ਼ਾਟ" diff --git a/quickstep/res/values-pl/strings.xml b/quickstep/res/values-pl/strings.xml index 19b666a704..d8bbb43073 100644 --- a/quickstep/res/values-pl/strings.xml +++ b/quickstep/res/values-pl/strings.xml @@ -76,6 +76,7 @@ "Wszystko gotowe" "Aby przejść na stronę główną, przesuń palcem w górę" "Teraz możesz zacząć używać telefonu" + "Teraz możesz zacząć używać tabletu" "Ustawienia nawigacji w systemie" "Udostępnij" "Zrzut ekranu" diff --git a/quickstep/res/values-pt-rPT/strings.xml b/quickstep/res/values-pt-rPT/strings.xml index 4e7b7a6351..e8292100b8 100644 --- a/quickstep/res/values-pt-rPT/strings.xml +++ b/quickstep/res/values-pt-rPT/strings.xml @@ -76,6 +76,7 @@ "Tudo pronto!" "Deslize rapidamente para cima para aceder ao ecrã principal" "Já pode começar a utilizar o seu telemóvel" + "Já pode começar a usar o seu tablet" "Definições de navegação do sistema" "Partilhar" "Fazer captura de ecrã" diff --git a/quickstep/res/values-pt/strings.xml b/quickstep/res/values-pt/strings.xml index d4a56acb20..30e59c22f0 100644 --- a/quickstep/res/values-pt/strings.xml +++ b/quickstep/res/values-pt/strings.xml @@ -76,6 +76,7 @@ "Tudo pronto!" "Deslize para cima para acessar a tela inicial" "Você já pode começar a usar seu smartphone" + "Você já pode começar a usar seu tablet" "Configurações de navegação do sistema" "Compartilhar" "Capturar tela" diff --git a/quickstep/res/values-ro/strings.xml b/quickstep/res/values-ro/strings.xml index 38d596cd4b..0294adabf5 100644 --- a/quickstep/res/values-ro/strings.xml +++ b/quickstep/res/values-ro/strings.xml @@ -76,6 +76,7 @@ "Gata!" "Glisați în sus pentru a accesa ecranul de pornire" "Sunteți gata să folosiți telefonul" + "Sunteți gata să folosiți tableta" "Setările de navigare ale sistemului" "Distribuiți" "Captură de ecran" diff --git a/quickstep/res/values-ru/strings.xml b/quickstep/res/values-ru/strings.xml index 7d27436abf..6b36b5ab5e 100644 --- a/quickstep/res/values-ru/strings.xml +++ b/quickstep/res/values-ru/strings.xml @@ -76,6 +76,7 @@ "Готово!" "Чтобы перейти на главный экран, проведите вверх." "Теперь вы можете использовать телефон." + "Теперь вы можете использовать планшет." "Системные настройки навигации" "Поделиться" "Скриншот" diff --git a/quickstep/res/values-si/strings.xml b/quickstep/res/values-si/strings.xml index 3c15a851c7..360f1892c0 100644 --- a/quickstep/res/values-si/strings.xml +++ b/quickstep/res/values-si/strings.xml @@ -76,6 +76,7 @@ "සියල්ල සූදානම්!" "මුල් පිටුවට යාමට ඉහළට ස්වයිප් කරන්න" "ඔබ ඔබගේ දුරකථනය භාවිත කිරීම පටන් ගැනීමට සූදානම්" + "ඔබ ඔබගේ ටැබ්ලටය භාවිත කිරීම පටන් ගැනීමට සූදානම්" "පද්ධති සංචාලන සැකසීම්" "බෙදා ගන්න" "තිර රුව" diff --git a/quickstep/res/values-sk/strings.xml b/quickstep/res/values-sk/strings.xml index 155da05c18..5281c571d1 100644 --- a/quickstep/res/values-sk/strings.xml +++ b/quickstep/res/values-sk/strings.xml @@ -76,6 +76,7 @@ "Hotovo" "Potiahnutím nahor prejdete na plochu" "Telefón môžete začať používať" + "Tablet môžete začať používať" "Nastavenia navigácie systémom" "Zdieľať" "Snímka obrazovky" diff --git a/quickstep/res/values-sl/strings.xml b/quickstep/res/values-sl/strings.xml index 82035280b6..87ed18a8be 100644 --- a/quickstep/res/values-sl/strings.xml +++ b/quickstep/res/values-sl/strings.xml @@ -76,6 +76,7 @@ "Končano" "Povlecite navzgor za začetni zaslon" "Pripravljeni ste, da začnete uporabljati telefon" + "Pripravljeni ste, da začnete uporabljati tablični računalnik." "Nastavitve krmarjenja po sistemu" "Deli" "Posnetek zaslona" diff --git a/quickstep/res/values-sq/strings.xml b/quickstep/res/values-sq/strings.xml index 999768c230..828b44091c 100644 --- a/quickstep/res/values-sq/strings.xml +++ b/quickstep/res/values-sq/strings.xml @@ -76,6 +76,7 @@ "Plotësisht gati!" "Rrëshqit shpejt lart për të shkuar tek \"Ekrani bazë\"" "Je gati për të filluar përdorimin e telefonit tënd" + "Je gati që të fillosh të përdorësh tabletin" "Cilësimet e navigimit të sistemit" "Ndaj" "Pamja e ekranit" diff --git a/quickstep/res/values-sr/strings.xml b/quickstep/res/values-sr/strings.xml index 309aaeb75a..8e5dcba063 100644 --- a/quickstep/res/values-sr/strings.xml +++ b/quickstep/res/values-sr/strings.xml @@ -76,6 +76,7 @@ "Готово!" "Превуците нагоре да бисте отворили почетни екран" "Спремни сте да почнете да користите телефон" + "Спремни сте да почнете да користите таблет" "Подешавања кретања кроз систем" "Дели" "Снимак екрана" diff --git a/quickstep/res/values-sv/strings.xml b/quickstep/res/values-sv/strings.xml index 49f20c08c9..bb9eababa0 100644 --- a/quickstep/res/values-sv/strings.xml +++ b/quickstep/res/values-sv/strings.xml @@ -76,6 +76,7 @@ "Klart!" "Svep uppåt för att öppna startskärmen" "Nu kan du börja använda telefonen" + "Nu kan du börja använda surfplattan" "Systemnavigeringsinställningar" "Dela" "Skärmbild" diff --git a/quickstep/res/values-sw/strings.xml b/quickstep/res/values-sw/strings.xml index e10d447a38..27b728b908 100644 --- a/quickstep/res/values-sw/strings.xml +++ b/quickstep/res/values-sw/strings.xml @@ -76,6 +76,7 @@ "Tayari!" "Telezesha kidole juu ili uende kwenye skrini ya kwanza" "Uko tayari kuanza kutumia simu yako" + "Uko tayari kuanza kutumia kompyuta kibao yako" "Mipangilio ya usogezaji kwenye mfumo" "Shiriki" "Picha ya skrini" diff --git a/quickstep/res/values-sw720dp/dimens.xml b/quickstep/res/values-sw720dp/dimens.xml index 05e269b17d..e381cb0911 100644 --- a/quickstep/res/values-sw720dp/dimens.xml +++ b/quickstep/res/values-sw720dp/dimens.xml @@ -15,6 +15,11 @@ */ --> - 44dp + 16dp + 16dp + 64dp + 36dp 44dp + 44dp + 44dp diff --git a/quickstep/res/values-ta/strings.xml b/quickstep/res/values-ta/strings.xml index ebf5eb2627..0144430173 100644 --- a/quickstep/res/values-ta/strings.xml +++ b/quickstep/res/values-ta/strings.xml @@ -76,6 +76,7 @@ "அனைத்தையும் அமைத்துவிட்டீர்கள்!" "முகப்புத் திரைக்குச் செல்ல மேல்நோக்கி ஸ்வைப் செய்யுங்கள்" "மொபைலைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்" + "உங்கள் டேப்லெட்டைப் பயன்படுத்தத் தயாராகிவிட்டீர்கள்" "சிஸ்டம் வழிசெலுத்தல் அமைப்புகள்" "பகிர்" "ஸ்கிரீன்ஷாட்" diff --git a/quickstep/res/values-te/strings.xml b/quickstep/res/values-te/strings.xml index 8f43b3c385..ebd24dcdf3 100644 --- a/quickstep/res/values-te/strings.xml +++ b/quickstep/res/values-te/strings.xml @@ -76,6 +76,7 @@ "అంతా సెట్ అయింది!" "మొదటి స్క్రీన్‌కు వెళ్లడానికి పైకి స్వైప్ చేయండి" "మీరు మీ ఫోన్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు" + "మీరు మీ టాబ్లెట్‌ను ఉపయోగించడానికి సిద్ధంగా ఉన్నారు" "సిస్టమ్ నావిగేషన్ సెట్టింగ్‌లు" "షేర్ చేయండి" "స్క్రీన్‌షాట్" diff --git a/quickstep/res/values-th/strings.xml b/quickstep/res/values-th/strings.xml index 62ab2d2c6c..95b6c210fd 100644 --- a/quickstep/res/values-th/strings.xml +++ b/quickstep/res/values-th/strings.xml @@ -76,6 +76,7 @@ "เรียบร้อยแล้ว" "ปัดขึ้นเพื่อไปที่หน้าแรก" "คุณเริ่มใช้โทรศัพท์ได้แล้ว" + "คุณเริ่มใช้แท็บเล็ตได้แล้ว" "การตั้งค่าการนำทางของระบบ" "แชร์" "ภาพหน้าจอ" diff --git a/quickstep/res/values-tl/strings.xml b/quickstep/res/values-tl/strings.xml index 71b01b6cc0..53084e2a77 100644 --- a/quickstep/res/values-tl/strings.xml +++ b/quickstep/res/values-tl/strings.xml @@ -76,6 +76,7 @@ "Handa na ang lahat!" "Mag-swipe pataas para pumunta sa Home" "Handa mo nang simulan ang paggamit sa iyong telepono" + "Handa mo nang simulan ang paggamit sa iyong tablet" "Mga setting ng navigation ng system" "Ibahagi" "Screenshot" diff --git a/quickstep/res/values-tr/strings.xml b/quickstep/res/values-tr/strings.xml index 5e9a84b39b..0e2cffbf43 100644 --- a/quickstep/res/values-tr/strings.xml +++ b/quickstep/res/values-tr/strings.xml @@ -76,6 +76,7 @@ "İşlem tamam!" "Ana ekrana gitmek için yukarı kaydırın" "Telefonunuzu kullanmaya hazırsınız" + "Tabletinizi kullanmaya hazırsınız" "Sistem gezinme ayarları" "Paylaş" "Ekran görüntüsü" diff --git a/quickstep/res/values-uk/strings.xml b/quickstep/res/values-uk/strings.xml index 2e0d3f7dd2..5e4167d91b 100644 --- a/quickstep/res/values-uk/strings.xml +++ b/quickstep/res/values-uk/strings.xml @@ -76,6 +76,7 @@ "Готово." "Щоб перейти на головний екран, проведіть пальцем угору" "Тепер ви можете користуватися телефоном" + "Тепер ви можете користуватися планшетом" "Системні налаштування навігації" "Поділитися" "Знімок екрана" diff --git a/quickstep/res/values-ur/strings.xml b/quickstep/res/values-ur/strings.xml index 2b055acf02..975a184325 100644 --- a/quickstep/res/values-ur/strings.xml +++ b/quickstep/res/values-ur/strings.xml @@ -76,6 +76,7 @@ "سب کچھ تیار ہے!" "ہوم پر جانے کے لیے اوپر سوائپ کریں" "آپ اپنا فون استعمال شروع کرنے کے لیے تیار ہیں" + "آپ اپنے ٹیبلیٹ کا استعمال شروع کرنے کے لیے تیار ہیں" "سسٹم نیویگیشن کی ترتیبات" "اشتراک کریں" "اسکرین شاٹ" diff --git a/quickstep/res/values-uz/strings.xml b/quickstep/res/values-uz/strings.xml index 3b9853f787..f612987e21 100644 --- a/quickstep/res/values-uz/strings.xml +++ b/quickstep/res/values-uz/strings.xml @@ -76,6 +76,7 @@ "Hammasi tayyor!" "Boshiga qaytish uchun tepaga suring" "Telefoningiz xizmatga tayyor" + "Planshetingiz xizmatga tayyor" "Tizim navigatsiya sozlamalari" "Ulashish" "Skrinshot" diff --git a/quickstep/res/values-vi/strings.xml b/quickstep/res/values-vi/strings.xml index e3c66988a6..253fca2e3c 100644 --- a/quickstep/res/values-vi/strings.xml +++ b/quickstep/res/values-vi/strings.xml @@ -76,6 +76,7 @@ "Đã hoàn tất!" "Vuốt lên để chuyển đến Màn hình chính" "Vậy là bạn đã sẵn sàng sử dụng điện thoại của mình" + "Bạn đã sẵn sàng sử dụng máy tính bảng" "Chế độ cài đặt di chuyển trên hệ thống" "Chia sẻ" "Chụp ảnh màn hình" diff --git a/quickstep/res/values-zh-rCN/strings.xml b/quickstep/res/values-zh-rCN/strings.xml index a42476c836..eaf60185c3 100644 --- a/quickstep/res/values-zh-rCN/strings.xml +++ b/quickstep/res/values-zh-rCN/strings.xml @@ -76,6 +76,7 @@ "大功告成！" "向上滑动即可转到主屏幕" "您可以开始使用手机了" + "您可以开始使用平板电脑了" "系统导航设置" "分享" "屏幕截图" diff --git a/quickstep/res/values-zh-rHK/strings.xml b/quickstep/res/values-zh-rHK/strings.xml index f2fd5446cd..123a0165dd 100644 --- a/quickstep/res/values-zh-rHK/strings.xml +++ b/quickstep/res/values-zh-rHK/strings.xml @@ -76,6 +76,7 @@ "設定完成！" "向上滑動即可前往主畫面" "您可以開始使用手機了" + "您可以開始使用平板電腦了" "系統導覽設定" "分享" "螢幕截圖" diff --git a/quickstep/res/values-zh-rTW/strings.xml b/quickstep/res/values-zh-rTW/strings.xml index f1fe624cee..a2b204f7ef 100644 --- a/quickstep/res/values-zh-rTW/strings.xml +++ b/quickstep/res/values-zh-rTW/strings.xml @@ -76,6 +76,7 @@ "設定完成！" "向上滑動即可前往主畫面" "你可以開始使用手機了" + "你可以開始使用平板電腦了" "系統操作機制設定" "分享" "螢幕截圖" diff --git a/quickstep/res/values-zu/strings.xml b/quickstep/res/values-zu/strings.xml index 98ea6d7b96..41f6a7ae3f 100644 --- a/quickstep/res/values-zu/strings.xml +++ b/quickstep/res/values-zu/strings.xml @@ -76,6 +76,7 @@ "Konke kusethiwe!" "Swayiphela phezulu ukuze uye Ekhaya" "Usulungele ukuqala ukusebenzisa ifoni yakho" + "Usulungele ukuqala ukusebenzisa ithebulethi yakho" "Amasethingi wokuzulazula isistimu" "Yabelana" "Isithombe-skrini" diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml index 671a617f01..185c815ea1 100644 --- a/quickstep/res/values/colors.xml +++ b/quickstep/res/values/colors.xml @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + #fff #39000000 @@ -24,7 +24,6 @@ #3cffffff - @color/overview_scrim_dark #E0E0E0 #ffffff #3C4043 - #FF000000 - #B7F29F #202124 diff --git a/quickstep/res/values/config.xml b/quickstep/res/values/config.xml index 3a4bb1086f..3b4a28b39c 100644 --- a/quickstep/res/values/config.xml +++ b/quickstep/res/values/config.xml @@ -23,8 +23,8 @@ com.android.quickstep.logging.StatsLogCompatManager - com.android.quickstep.QuickstepTestInformationHandler + com.android.quickstep.util.SystemWindowManagerProxy diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 926e10c8b7..2b71768b83 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -110,8 +110,10 @@ 136dp - 24dp - 140dp + 8dp + 140dp + 16dp + 24dp 72dp 18dp 80dp @@ -124,15 +126,46 @@ 4dp 26dp 18dp - 126dp + 34dp + 211dp + 24dp + 66dp + 0 + 124dp + 144dp + 34dp + 24dp + 126dp + 245dp + 241dp + 401dp + 245dp + 273dp 56dp 100dp 28dp 20dp + 217dp + 142dp + 190dp + 171dp + 198dp + 79dp + 174dp + 117dp + 65dp + 132dp + 161dp + 0 + 24dp + 66dp + -1px + -2px + 26dp 60dp 100dp 50dp @@ -148,11 +181,20 @@ 4dp 36dp 22dp + 16dp + 24dp + 97dp + 97dp + 126dp + 64dp + 151dp + 24dp + 0 44dp 100dp - 218dp + 52dp 40dp @@ -217,6 +259,7 @@ 35dp 24dp 220dp + 316dp 4dp 25dp 4dp diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml index 3ee2af0bed..f80deeba45 100644 --- a/quickstep/res/values/strings.xml +++ b/quickstep/res/values/strings.xml @@ -182,8 +182,10 @@ All set! Swipe up to go Home - + You\u2019re ready to start using your phone + + You\u2019re ready to start using your tablet System navigation settings diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml index 2efe72e651..7225220876 100644 --- a/quickstep/res/values/styles.xml +++ b/quickstep/res/values/styles.xml @@ -47,6 +47,12 @@ 44sp + + + + @@ -77,8 +89,8 @@