Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce392903 authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merging ub-launcher3-qt-dev, build 5528135 

am: 4c8e5dd2

Change-Id: I9db1b1aaa48a84bbe8fb87e1d31d9c987f6b3ed8
parents cd5ed8b2 4c8e5dd2

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ LOCAL_PROGUARD_ENABLED := full 
LOCAL_PACKAGE_NAME := Launcher3GoIconRecents

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3QuickStepGo

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_FULL_LIBS_MANIFEST_FILES := \

go/quickstep/res/layout/clear_all_button.xml

+5 −7
Original line number Diff line number Diff line
@@ -14,22 +14,20 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<com.android.quickstep.views.ClearAllItemView

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/clear_all_item_view"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="@dimen/clear_all_item_view_height">

    <Button

        android:id="@+id/clear_all_button"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginVertical="16dp"

        android:layout_width="@dimen/clear_all_button_width"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal"

        android:paddingHorizontal="32dp"

        android:background="@drawable/clear_all_button"

        android:gravity="center"

        android:text="@string/recents_clear_all"

        android:textAllCaps="false"

        android:textColor="@color/clear_all_button_text"

        android:textSize="14sp"/>

</com.android.quickstep.views.ClearAllItemView>
 
</FrameLayout>

go/quickstep/res/layout/icon_recents_root_view.xml

+7 −3
Original line number Diff line number Diff line
@@ -18,12 +18,16 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical"

    android:clipChildren="false">

    <androidx.recyclerview.widget.RecyclerView

        android:id="@+id/recent_task_recycler_view"

        android:layout_width="match_parent"

        android:layout_width="@dimen/recents_list_width"

        android:layout_height="match_parent"

        android:scrollbars="none"/>

        android:layout_gravity="center_horizontal"

        android:scrollbars="none"

        android:clipToPadding="false"

        android:clipChildren="false"/>

    <TextView

        android:id="@+id/recent_task_empty_view"

        android:layout_width="match_parent"

go/quickstep/res/layout/task_item_view.xml

+2 −4
Original line number Diff line number Diff line
@@ -17,14 +17,13 @@ 
<com.android.quickstep.views.TaskItemView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="@dimen/task_item_height"

    android:orientation="horizontal">

    <com.android.quickstep.views.TaskThumbnailIconView

        android:id="@+id/task_icon_and_thumbnail"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginHorizontal="8dp"

        android:layout_marginTop="16dp">

        android:layout_marginHorizontal="@dimen/task_thumbnail_icon_horiz_margin">

        <ImageView

            android:id="@+id/task_thumbnail"

            android:layout_width="match_parent"
@@ -39,7 +38,6 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_marginHorizontal="8dp"

        android:singleLine="true"

        android:textColor="@android:color/white"

        android:textSize="24sp"/>

go/quickstep/res/values-sw480dp/dimens.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2019 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.

-->

<resources>

    <dimen name="recents_list_width">480dp</dimen>



    <dimen name="task_item_height">90dp</dimen>

    <dimen name="task_item_top_margin">16dp</dimen>

    <dimen name="task_thumbnail_icon_horiz_margin">20dp</dimen>



    <dimen name="task_thumbnail_corner_radius">4dp</dimen>



    <dimen name="clear_all_item_view_height">48dp</dimen>

    <dimen name="clear_all_item_view_top_margin">28dp</dimen>

    <dimen name="clear_all_item_view_bottom_margin">28dp</dimen>

    <dimen name="clear_all_button_width">140dp</dimen>

</resources>
 
 No newline at end of file