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

Commit 9b001396 authored by Winson's avatar Winson
Browse files

Updating visuals for incompatible apps.

Bug: 26774190
Change-Id: I688d5dbab0305e794cad832ae92a8e5c9440737a
parent cf45224a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="48.0dp"
        android:height="48.0dp"
        android:width="24.0dp"
        android:height="24.0dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ Copyright (C) 2014 The Android Open Source Project
    limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="48.0dp"
        android:height="48.0dp"
        android:width="24.0dp"
        android:height="24.0dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,14 @@
        android:layout_height="match_parent">
    </com.android.systemui.recents.views.RecentsView>

    <!-- Incompatible task overlay -->
    <ViewStub android:id="@+id/incompatible_app_overlay_stub"
        android:inflatedId="@+id/incompatible_app_overlay"
        android:layout="@layout/recents_incompatible_app_overlay"
        android:layout_width="match_parent"
        android:layout_height="128dp"
        android:layout_gravity="center_horizontal|top" />

    <!-- Nav Bar Scrim View -->
    <ImageView
        android:id="@+id/nav_bar_scrim"
+30 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 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.
-->
<FrameLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:alpha="0"
    android:background="#88000000"
    android:forceHasOverlappingRendering="false">
    <TextView
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:drawableTop="@drawable/recents_info_light"
        android:drawablePadding="8dp"
        android:text="@string/recents_incompatible_app_message" />
</FrameLayout>
 No newline at end of file
+13 −0
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@
            android:id="@+id/task_view_thumbnail"
            android:layout_width="match_parent"
            android:layout_height="match_parent" />

        <include layout="@layout/recents_task_view_header" />

        <com.android.systemui.statusbar.AlphaOptimizedFrameLayout
            android:id="@+id/lock_to_app_fab"
            android:layout_width="@dimen/recents_lock_to_app_size"
@@ -45,6 +47,17 @@
                android:layout_gravity="center"
                android:src="@drawable/recents_lock_to_app_pin" />
        </com.android.systemui.statusbar.AlphaOptimizedFrameLayout>

        <!-- The incompatible app toast -->
        <ViewStub android:id="@+id/incompatible_app_toast_stub"
                    android:inflatedId="@+id/incompatible_app_toast"
                    android:layout="@*android:layout/transient_notification"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="top|center_horizontal"
                    android:layout_marginTop="48dp"
                    android:layout_marginLeft="16dp"
                    android:layout_marginRight="16dp" />
    </FrameLayout>
</com.android.systemui.recents.views.TaskView>

Loading