diff --git a/Android.bp b/Android.bp index 95d63f2744c..dbd84eb946e 100644 --- a/Android.bp +++ b/Android.bp @@ -458,6 +458,7 @@ android_library { "launcher-executors-module", "libGoogleFeed", "SettingsLib", + ], manifest: "AndroidManifest-common.xml", sdk_version: "current", @@ -482,6 +483,8 @@ android_app { static_libs: [ "Launcher3ResLib", + "androidx.room_room-runtime", + "androidx.room_room-ktx", ], srcs: [ ":launcher-src", @@ -498,7 +501,10 @@ android_app { sdk_version: "current", min_sdk_version: min_launcher3_sdk_version, target_sdk_version: "current", - plugins: ["dagger2-compiler"], + plugins: [ + "androidx.room_room-compiler-plugin", + "dagger2-compiler", + ], certificate: "platform", privileged: true, system_ext_specific: true, @@ -582,6 +588,7 @@ android_library { static_libs: [ "QuickstepResLib", "androidx.room_room-runtime", + "androidx.room_room-ktx", ], plugins: [ "androidx.room_room-compiler-plugin", @@ -624,10 +631,16 @@ android_library { static_libs: [ "SystemUI-statsd", "QuickstepResLib", + "androidx.room_room-runtime", + "androidx.room_room-ktx", + "axquicklook-client", ], manifest: "quickstep/AndroidManifest.xml", platform_apis: true, - plugins: ["dagger2-compiler"], + plugins: [ + "androidx.room_room-compiler-plugin", + "dagger2-compiler", + ], min_sdk_version: "current", // TODO(b/319712088): re-enable use_resource_processor use_resource_processor: false, diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index ad598818e1f..cc9cca46de1 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -47,6 +47,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index 946a454462c..7c54deb39ae 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -650,3 +650,10 @@ flag { description: "Enables mouse based workflows for interacting with launcher" bug: "388897603" } + +flag { + name: "app_launch_blur" + namespace: "launcher" + description: "Enable background blur at app launch" + bug: "379905951" +} diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000000..d650cbe4fd4 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /res/values/alpha_strings.xml + translation: /res/values-%android_code%/%original_file_name% diff --git a/go/quickstep/src/com/android/launcher3/BuildConfig.java b/go/quickstep/src/com/android/launcher3/BuildConfig.java index 53ccbd30c76..48a083ac436 100644 --- a/go/quickstep/src/com/android/launcher3/BuildConfig.java +++ b/go/quickstep/src/com/android/launcher3/BuildConfig.java @@ -24,7 +24,7 @@ public final class BuildConfig { * Flag to state if the QSB is on the first screen and placed on the top, * this can be overwritten in other launchers with a different value, if needed. */ - public static final boolean QSB_ON_FIRST_SCREEN = true; + public static final boolean USE_QUICKSPACE_VIEW = true; /** * Flag to control various developer centric features diff --git a/privapp_whitelist_com.android.launcher3-ext.xml b/privapp_whitelist_com.android.launcher3-ext.xml index 2101a8c328a..14253824cbb 100644 --- a/privapp_whitelist_com.android.launcher3-ext.xml +++ b/privapp_whitelist_com.android.launcher3-ext.xml @@ -19,5 +19,14 @@ + + + + + + + + + diff --git a/proguard.flags b/proguard.flags index ebf177a9d79..f272875a362 100644 --- a/proguard.flags +++ b/proguard.flags @@ -51,4 +51,16 @@ # Don't warn about those in case this app is linking against an older # platform version. We know about them, and they are safe. -dontwarn android.support.** --dontwarn org.apache.http.** \ No newline at end of file +-dontwarn org.apache.http.** + +-keep class com.android.launcher3.icons.** { + *; +} + +-keep class com.android.launcher3.data.** { + *; +} + +-keep class com.android.launcher3.lineage.trust.** { + *; +} diff --git a/quickstep/res/drawable/bg_overview_actions_button.xml b/quickstep/res/drawable/bg_overview_actions_button.xml new file mode 100644 index 00000000000..51e17a86d18 --- /dev/null +++ b/quickstep/res/drawable/bg_overview_actions_button.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/quickstep/res/drawable/ic_clear_all.xml b/quickstep/res/drawable/ic_clear_all.xml new file mode 100644 index 00000000000..00e8fd42a31 --- /dev/null +++ b/quickstep/res/drawable/ic_clear_all.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/ic_kill_app.xml b/quickstep/res/drawable/ic_kill_app.xml new file mode 100644 index 00000000000..bb7036a6ac6 --- /dev/null +++ b/quickstep/res/drawable/ic_kill_app.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/quickstep/res/drawable/ic_lens.xml b/quickstep/res/drawable/ic_lens.xml new file mode 100644 index 00000000000..e372e83526c --- /dev/null +++ b/quickstep/res/drawable/ic_lens.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/quickstep/res/drawable/ic_lock_recent.xml b/quickstep/res/drawable/ic_lock_recent.xml new file mode 100644 index 00000000000..f084b733404 --- /dev/null +++ b/quickstep/res/drawable/ic_lock_recent.xml @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/quickstep/res/drawable/ic_screenshot.xml b/quickstep/res/drawable/ic_screenshot.xml index 9ee6c44011d..093ea9fd3e3 100644 --- a/quickstep/res/drawable/ic_screenshot.xml +++ b/quickstep/res/drawable/ic_screenshot.xml @@ -12,21 +12,9 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - \ No newline at end of file + + + + + + diff --git a/quickstep/res/drawable/ic_unlock_recent.xml b/quickstep/res/drawable/ic_unlock_recent.xml new file mode 100644 index 00000000000..56a26360629 --- /dev/null +++ b/quickstep/res/drawable/ic_unlock_recent.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/quickstep/res/drawable/recents_lock_state.xml b/quickstep/res/drawable/recents_lock_state.xml new file mode 100644 index 00000000000..4b08079adc0 --- /dev/null +++ b/quickstep/res/drawable/recents_lock_state.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/quickstep/res/drawable/task_menu_item_bg.xml b/quickstep/res/drawable/task_menu_item_bg.xml index 588fe9ec25a..c95c2ed8308 100644 --- a/quickstep/res/drawable/task_menu_item_bg.xml +++ b/quickstep/res/drawable/task_menu_item_bg.xml @@ -15,7 +15,12 @@ limitations under the License. --> - - - - + + + + + + + + diff --git a/quickstep/res/layout/fallback_recents_activity.xml b/quickstep/res/layout/fallback_recents_activity.xml index f0ea09c1afe..4adbb282d3d 100644 --- a/quickstep/res/layout/fallback_recents_activity.xml +++ b/quickstep/res/layout/fallback_recents_activity.xml @@ -52,5 +52,8 @@ android:id="@+id/overview_actions_view" layout="@layout/overview_actions_container" /> + + diff --git a/quickstep/res/layout/meminfo.xml b/quickstep/res/layout/meminfo.xml new file mode 100644 index 00000000000..0aa9ba9994b --- /dev/null +++ b/quickstep/res/layout/meminfo.xml @@ -0,0 +1,9 @@ + + diff --git a/quickstep/res/layout/overview_actions_container.xml b/quickstep/res/layout/overview_actions_container.xml index ce54028256e..b4b731b77df 100644 --- a/quickstep/res/layout/overview_actions_container.xml +++ b/quickstep/res/layout/overview_actions_container.xml @@ -34,17 +34,46 @@ android:id="@+id/action_screenshot" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginHorizontal="6dp" android:drawableStart="@drawable/ic_screenshot" - android:text="@string/action_screenshot" /> + android:text="@string/recents_screenshot_title" + android:visibility="gone" /> + +