diff --git a/Android.bp b/Android.bp index 597cc04b74..19d2a5893b 100644 --- a/Android.bp +++ b/Android.bp @@ -207,9 +207,12 @@ android_library { name: "Launcher3CommonDepsLib", srcs: ["src_build_config/**/*.java"], static_libs: [ + "SystemUI-statsd", "Launcher3ResLib", "launcher-testing-shared", "animationlib", + "com_android_launcher3_flags_lib", + "com_android_wm_shell_flags_lib", ], sdk_version: "current", min_sdk_version: min_launcher3_sdk_version, @@ -280,6 +283,7 @@ android_library { "Launcher3ResLib", "lottie", "SystemUISharedLib", + "SettingsLibSettingsTheme", "SystemUI-statsd", "animationlib", ], diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index 14605d8053..7e824ec15c 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -67,6 +67,7 @@ "ይቅር" "ቅንብሮች" "በማያ ገጹ ላይ ጽሑፍን ይተረጉሙ ወይም ያዳምጡ" - "እንደ በማያ ገጽዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገጽ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" + "እንደ በማያ ገፅዎ ላይ ያለ ጽሁፍ፣ የድር አድራሻዎች እና ቅጽበታዊ ገፅ እይታዎች ያሉ መረጃዎች ለGoogle ሊጋሩ ይችላሉ።\n\nምን መረጃ እንደሚያጋሩ ለመቀየር ወደ ""ቅንብሮች > መተግበሪያዎች > ነባሪ መተግበሪያዎች > ዲጂታል ረዳት መተግበሪያ"" ይሂዱ።" "ይህንን ባህሪ ለመጠቀም ረዳት ይምረጡ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያን ይምረጡ" "ይህንን ባህሪ ለመጠቀም ረዳትዎን ይቀይሩ" "በማያ ገጽዎ ላይ ጽሑፍን ለማዳመጥ ወይም ለመተርጎም በቅንብሮች ውስጥ የዲጂታል ረዳት መተግበሪያዎን ይቀይሩ" - "በዚህ ማያ ገጽ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ" - "በዚህ ማያ ገጽ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ" + "በዚህ ማያ ገፅ ላይ ጽሁፍ ለማዳመጥ እዚህ መታ ያድርጉ" + "በዚህ ማያ ገፅ ላይ ጽሁፍ ለመተርጎም እዚህ መታ ያድርጉ" "ይህ መተግበሪያ ሊጋራ አይችልም" diff --git a/go/quickstep/res/values-el/strings.xml b/go/quickstep/res/values-el/strings.xml index 9a67420f30..7038c11e57 100644 --- a/go/quickstep/res/values-el/strings.xml +++ b/go/quickstep/res/values-el/strings.xml @@ -14,7 +14,7 @@ "Για να ακούσετε ή να μεταφράσετε κείμενο στην οθόνη σας, επιλέξτε μια εφαρμογή ψηφιακού βοηθού στις Ρυθμίσεις." "Αλλάξτε τον βοηθό σας για να χρησιμοποιήσετε αυτήν τη λειτουργία" "Για να ακούσετε ή να μεταφράσετε κείμενο στην οθόνη σας, αλλάξτε την εφαρμογή ψηφιακού βοηθού στις Ρυθμίσεις." - "Πατήστε εδώ για να ακούσετε το κείμενο σε αυτήν την οθόνη" - "Πατήστε εδώ για να μεταφράσετε το κείμενο σε αυτήν την οθόνη" + "Πατήστε εδώ για να ακούσετε το κείμενο σε αυτή την οθόνη" + "Πατήστε εδώ για να μεταφράσετε το κείμενο σε αυτή την οθόνη" "Δεν είναι δυνατή η κοινή χρήση της εφαρμογής" diff --git a/go/quickstep/res/values-ky/strings.xml b/go/quickstep/res/values-ky/strings.xml index 55e70c8cdf..dcc1e4ea77 100644 --- a/go/quickstep/res/values-ky/strings.xml +++ b/go/quickstep/res/values-ky/strings.xml @@ -11,9 +11,9 @@ "Экрандагы текстти которуу же угуу" "Экрандагы текст, веб-даректер жана скриншоттор сыяктуу маалымат Google менен бөлүшүлүшү мүмкүн.\n\nБөлүшүлгөн маалыматты өзгөртүү үчүн""Параметрлер > Колдонмолор > Демейки колдонмолор > Санариптик жардамчы колдонмосуна өтүңүз""." "Бул функцияны колдонуу үчүн жардамчыны тандаңыз" - "Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун тандаңыз" + "Экраныңыздагы текстти угуу же которуу үчүн Параметрлерден санариптик жардамчы колдонмосун тандаңыз" "Бул функцияны колдонуу үчүн жардамчыңызды өзгөртүңүз" - "Экраныңыздагы текстти угуу же которуу үчүн Жөндөөлөрдөн санариптик жардамчы колдонмосун өзгөртүңүз" + "Экраныңыздагы текстти угуу же которуу үчүн Параметрлерден санариптик жардамчы колдонмосун өзгөртүңүз" "Бул экрандагы текстти угуу үчүн бул жерди басыңыз" "Бул экрандагы текстти которуу үчүн бул жерди басыңыз" "Бул колдонмону бөлүшүүгө болбойт" diff --git a/go/src/com/android/launcher3/model/LauncherBinder.java b/go/src/com/android/launcher3/model/LauncherBinder.java index 437d8caf94..7a0dce853b 100644 --- a/go/src/com/android/launcher3/model/LauncherBinder.java +++ b/go/src/com/android/launcher3/model/LauncherBinder.java @@ -38,4 +38,8 @@ public class LauncherBinder extends BaseLauncherBinder { @Override public void bindWidgets() { } + + @Override + public void bindSmartspaceWidget() { + } } diff --git a/protos/launcher_atom.proto b/protos/launcher_atom.proto index f8b08f86c0..7c648b6d88 100644 --- a/protos/launcher_atom.proto +++ b/protos/launcher_atom.proto @@ -38,7 +38,7 @@ message ItemInfo { optional int32 rank = 5; // Stores whether the Item belows to non primary user - optional bool is_work = 6; + optional bool is_work = 6 [deprecated = true]; // Item can be child node to parent container or parent containers (nested) optional ContainerInfo container_info = 7; @@ -48,6 +48,9 @@ message ItemInfo { // Stores whether the navigation bar is in kids mode. optional bool is_kids_mode = 13; + + // Stores type of the user the Item belong to + optional int32 user_type = 14; } message LauncherAttributes{ @@ -135,7 +138,7 @@ message TaskBarContainer { } } -// Next value 52 +// Next value 54 enum Attribute { option allow_alias = true; @@ -180,7 +183,8 @@ enum Attribute { ALL_APPS_SEARCH_RESULT_CHROMETAB = 24; ALL_APPS_SEARCH_RESULT_NAVVYSITE = 25 [deprecated = true]; ALL_APPS_SEARCH_RESULT_TIPS = 26; - ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27; + ALL_APPS_SEARCH_RESULT_QS_TILE = 27; + ALL_APPS_SEARCH_RESULT_PEOPLE_TILE = 27 [deprecated = true]; ALL_APPS_SEARCH_RESULT_LEGACY_SHORTCUT = 30; ALL_APPS_SEARCH_RESULT_ASSISTANT_MEMORY = 31; ALL_APPS_SEARCH_RESULT_VIDEO = 41; @@ -188,6 +192,7 @@ enum Attribute { ALL_APPS_SEARCH_RESULT_EDUCARD = 43; ALL_APPS_SEARCH_RESULT_LOCATION = 50; ALL_APPS_SEARCH_RESULT_TEXT_HEADER = 51; + ALL_APPS_SEARCH_RESULT_NO_FULFILLMENT = 52; // Result sources DATA_SOURCE_APPSEARCH_APP_PREVIEW = 45; @@ -195,6 +200,7 @@ enum Attribute { DATA_SOURCE_APPSEARCH_CATEGORY_SRP_PREVIEW = 48; DATA_SOURCE_APPSEARCH_ENTITY_SRP_PREVIEW = 49; DATA_SOURCE_AIAI_SEARCH_ROOT = 47; + DATA_SOURCE_LAUNCHER = 53; // Web suggestions provided by AGA ALL_APPS_SEARCH_RESULT_WEB_SUGGEST = 39; diff --git a/quickstep/Android.bp b/quickstep/Android.bp index 638ce27800..ec4f6fccd3 100644 --- a/quickstep/Android.bp +++ b/quickstep/Android.bp @@ -41,6 +41,7 @@ filegroup { "tests/src/com/android/quickstep/TaskbarModeSwitchRule.java", "tests/src/com/android/quickstep/NavigationModeSwitchRule.java", "tests/src/com/android/quickstep/AbstractQuickStepTest.java", + "tests/src/com/android/quickstep/TaplOverviewIconTest.java", "tests/src/com/android/quickstep/TaplTestsQuickstep.java", "tests/src/com/android/quickstep/TaplTestsSplitscreen.java", ] diff --git a/quickstep/AndroidManifest.xml b/quickstep/AndroidManifest.xml index 7c0a5aece0..db46508385 100644 --- a/quickstep/AndroidManifest.xml +++ b/quickstep/AndroidManifest.xml @@ -30,7 +30,9 @@ + + @@ -41,6 +43,10 @@ + + + + android:theme="@style/ProxyActivityStarterTheme" + android:launchMode="singleTask" + android:clearTaskOnLaunch="true" + android:exported="false" + /> + + + + + + + diff --git a/quickstep/protos_overrides/launcher_atom_extension.proto b/quickstep/protos_overrides/launcher_atom_extension.proto index b3df353913..4dbec98ce7 100644 --- a/quickstep/protos_overrides/launcher_atom_extension.proto +++ b/quickstep/protos_overrides/launcher_atom_extension.proto @@ -41,6 +41,7 @@ message DeviceSearchResultContainer{ // For application, it will be the column number in the apps row. optional int32 grid_x = 3; + // LINT.IfChange // Next ID = 4 message SearchAttributes{ @@ -64,6 +65,10 @@ message DeviceSearchResultContainer{ // User entered by swiping up from overview (using Rocket Gesture). OVERVIEW = 3; + + // User entered by tapping the search box in the Taskbar AllApps drawer. + TASKBAR = 4; } } + // LINT.ThenChange(//quickstep/src/com/android/quickstep/logging/StatsLogCompatManager.java) } diff --git a/quickstep/res/drawable/ic_chevron_down.xml b/quickstep/res/drawable/ic_chevron_down.xml new file mode 100644 index 0000000000..77a82958ba --- /dev/null +++ b/quickstep/res/drawable/ic_chevron_down.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + diff --git a/quickstep/res/layout/icon_app_chip_view.xml b/quickstep/res/layout/icon_app_chip_view.xml new file mode 100644 index 0000000000..b7acb70721 --- /dev/null +++ b/quickstep/res/layout/icon_app_chip_view.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/system_shortcut_icons_container_material_u.xml b/quickstep/res/layout/icon_view.xml similarity index 56% rename from res/layout/system_shortcut_icons_container_material_u.xml rename to quickstep/res/layout/icon_view.xml index fbf18af547..e8c9cc5da4 100644 --- a/res/layout/system_shortcut_icons_container_material_u.xml +++ b/quickstep/res/layout/icon_view.xml @@ -1,5 +1,6 @@ - - - + android:layout_height="match_parent" + android:focusable="false" + android:importantForAccessibility="no"/> \ No newline at end of file diff --git a/quickstep/res/layout/keyboard_quick_switch_view.xml b/quickstep/res/layout/keyboard_quick_switch_view.xml index 16abdeefcf..5af8d5165f 100644 --- a/quickstep/res/layout/keyboard_quick_switch_view.xml +++ b/quickstep/res/layout/keyboard_quick_switch_view.xml @@ -17,6 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:androidprv="http://schemas.android.com/apk/prv/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/keyboard_quick_switch_view" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/keyboard_quick_switch_margin_top" diff --git a/quickstep/res/layout/split_instructions_view.xml b/quickstep/res/layout/split_instructions_view.xml index c663bf470c..0bbbfd5165 100644 --- a/quickstep/res/layout/split_instructions_view.xml +++ b/quickstep/res/layout/split_instructions_view.xml @@ -30,9 +30,15 @@ android:id="@+id/split_instructions_text" android:layout_height="wrap_content" android:layout_width="wrap_content" - android:gravity="center" android:textColor="?androidprv:attr/textColorOnAccent" - android:drawableEnd="@drawable/ic_split_exit" - android:drawablePadding="@dimen/split_instructions_drawable_padding" android:text="@string/toast_split_select_app" /> + + \ No newline at end of file diff --git a/quickstep/res/layout/task.xml b/quickstep/res/layout/task.xml index 29c9992999..823a86e1e4 100644 --- a/quickstep/res/layout/task.xml +++ b/quickstep/res/layout/task.xml @@ -44,10 +44,9 @@ android:importantForAccessibility="no" android:src="@drawable/ic_select_windows" /> - + android:inflatedId="@id/icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> \ No newline at end of file diff --git a/quickstep/res/layout/task_desktop.xml b/quickstep/res/layout/task_desktop.xml index 06f4d0686f..60827cddac 100644 --- a/quickstep/res/layout/task_desktop.xml +++ b/quickstep/res/layout/task_desktop.xml @@ -22,12 +22,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipChildren="true" - android:clipToOutline="true" android:defaultFocusHighlightEnabled="false" android:focusable="true" launcher:focusBorderColor="?androidprv:attr/materialColorOutline" - launcher:hoverBorderColor="?androidprv:attr/materialColorPrimary"> - + launcher:hoverBorderColor="?androidprv:attr/materialColorPrimary" + android:clipToPadding="true" + android:padding="0.1dp"> + - + android:inflatedId="@id/icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> diff --git a/quickstep/res/layout/task_grouped.xml b/quickstep/res/layout/task_grouped.xml index 75ff6268e4..d20afd3c79 100644 --- a/quickstep/res/layout/task_grouped.xml +++ b/quickstep/res/layout/task_grouped.xml @@ -66,17 +66,15 @@ android:importantForAccessibility="no" android:src="@drawable/ic_select_windows" /> - + android:inflatedId="@id/icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> - + android:inflatedId="@id/bottomRight_icon" + android:layout_height="wrap_content" + android:layout_width="wrap_content" /> \ No newline at end of file diff --git a/quickstep/res/layout/task_menu.xml b/quickstep/res/layout/task_menu.xml index a5c944540b..622edfeba0 100644 --- a/quickstep/res/layout/task_menu.xml +++ b/quickstep/res/layout/task_menu.xml @@ -31,8 +31,8 @@ android:layout_height="match_parent" android:gravity="center" android:layout_marginBottom="2dp" - android:paddingTop="@dimen/task_menu_vertical_padding" - android:paddingBottom="@dimen/task_menu_vertical_padding" + android:paddingTop="@dimen/task_menu_edge_padding" + android:paddingBottom="@dimen/task_menu_edge_padding" android:textSize="16sp"/> diff --git a/quickstep/res/layout/taskbar.xml b/quickstep/res/layout/taskbar.xml index 94388b42ec..72d7485d8f 100644 --- a/quickstep/res/layout/taskbar.xml +++ b/quickstep/res/layout/taskbar.xml @@ -45,9 +45,6 @@ android:id="@+id/start_contextual_buttons" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingStart="@dimen/taskbar_contextual_button_padding" - android:paddingEnd="@dimen/taskbar_contextual_button_padding" - android:paddingTop="@dimen/taskbar_contextual_padding_top" android:gravity="center_vertical" android:layout_gravity="start"/> @@ -63,7 +60,6 @@ android:id="@+id/end_contextual_buttons" android:layout_width="wrap_content" android:layout_height="match_parent" - android:paddingTop="@dimen/taskbar_contextual_padding_top" android:gravity="center_vertical" android:layout_gravity="end"/> diff --git a/quickstep/res/layout/taskbar_divider_popup_menu.xml b/quickstep/res/layout/taskbar_divider_popup_menu.xml index 00e47c9bed..7f4f76c1e9 100644 --- a/quickstep/res/layout/taskbar_divider_popup_menu.xml +++ b/quickstep/res/layout/taskbar_divider_popup_menu.xml @@ -19,7 +19,7 @@ android:layout_width="@dimen/taskbar_pinning_popup_menu_width" android:layout_height="wrap_content" android:focusable="true" - android:background="@drawable/popup_background_material_u" + android:background="@drawable/popup_background" android:orientation="vertical"> + app:constraint_referenced_ids="pinning_animation,pinning_text" /> + app:layout_constraintEnd_toStartOf="@id/suggestions_text" + app:layout_constraintTop_toBottomOf="@id/pinning_animation" /> + app:constraint_referenced_ids="splitscreen_text,pinning_text,suggestions_text" />