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

Commit 0a08f55f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge branch 'ub-launcher3-master' into master"

parents 43b0436f 544eb089

quickstep/libs/sysui_shared.jar

+17.5 KiB (91 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/res/drawable/task_thumbnail_background.xml

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

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

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="#FF000000" />

    <corners android:radius="2dp" />

</shape>

quickstep/res/layout/overview_panel.xml

+4 −27
Original line number Diff line number Diff line
@@ -19,30 +19,7 @@ 
    android:theme="@style/HomeScreenElementTheme"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center_horizontal|bottom"

    android:gravity="top">



    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal">



        <View

            android:layout_width="300dp"

            android:layout_height="match_parent"

            android:background="#44FF0000"

            android:layout_marginEnd="10dp"/>



        <View

            android:layout_width="300dp"

            android:layout_height="match_parent"

            android:background="#4400FF00"

            android:layout_marginEnd="10dp"/>



        <View

            android:layout_width="300dp"

            android:layout_height="match_parent"

            android:background="#440000FF" />

    </LinearLayout>



</com.android.quickstep.RecentsView>
 
 No newline at end of file
 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:alpha="0.0"

    android:visibility="invisible" />
 
 No newline at end of file

res/layout/shortcuts_item.xml→quickstep/res/layout/task.xml

+18 −21
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project

<!--

     Copyright (C) 2017 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.
@@ -13,27 +14,23 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<com.android.launcher3.shortcuts.ShortcutsItemView

<com.android.quickstep.TaskView

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

    android:id="@+id/shortcuts_view"

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="wrap_content"

    android:elevation="@dimen/deep_shortcuts_elevation">



    <LinearLayout

        android:id="@+id/content"

    android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">

    android:layout_height="match_parent">



        <!-- The shortcuts header is added at runtime when necessary. -->



        <LinearLayout

            android:id="@+id/shortcuts"

    <com.android.quickstep.TaskThumbnailView

        android:id="@+id/snapshot"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

            android:orientation="vertical" />

    </LinearLayout>



</com.android.launcher3.shortcuts.ShortcutsItemView>
 
        android:layout_marginTop="@dimen/task_thumbnail_top_margin"

        android:scaleType="matrix"

        android:background="@drawable/task_thumbnail_background"

        android:elevation="4dp" />

    <ImageView

        android:id="@+id/icon"

        android:layout_width="@dimen/task_thumbnail_icon_size"

        android:layout_height="@dimen/task_thumbnail_icon_size"

        android:layout_gravity="top|center_horizontal"

        android:elevation="5dp"/>

</com.android.quickstep.TaskView>
 
 No newline at end of file

quickstep/res/values/dimens.xml

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

<!-- Copyright (C) 2017 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="task_thumbnail_top_margin">24dp</dimen>

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



    <dimen name="quickstep_fling_threshold_velocity">500dp</dimen>

    <dimen name="quickstep_fling_min_velocity">250dp</dimen>



</resources>