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

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

Merge "Adding support for showing predicted apps as a floating row in all-apps...

Merge "Adding support for showing predicted apps as a floating row in all-apps and overview" into ub-launcher3-qt-dev
parents dcacfd7d 77b3419a
Loading
Loading
Loading
Loading
+19 −0
Original line number Diff line number Diff line
<!--
    Copyright (C) 2018 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="?android:attr/colorAccent" />
    <corners android:radius="8dp" />
</shape>
+62 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 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.
-->

<merge
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_height="wrap_content"
    android:layout_width="wrap_content">

    <LinearLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:paddingStart="24dp"
        android:paddingEnd="4dp"
        android:background="@drawable/arrow_toast_rounded_background"
        android:layout_gravity="center_horizontal"
        android:elevation="2dp"
        android:orientation="horizontal">

        <TextView
            android:id="@+id/text"
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
            android:layout_gravity="center_vertical"
            android:textColor="@android:color/white"
            android:textSize="16sp"/>
        <ImageView
            android:id="@+id/dismiss"
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:layout_gravity="center_vertical"
            android:padding="10dp"
            android:layout_marginStart="2dp"
            android:layout_marginEnd="2dp"
            android:alpha="0.7"
            android:src="@drawable/ic_remove_no_shadow"
            android:tint="@android:color/white"
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:contentDescription="@string/accessibility_close_task"/>
    </LinearLayout>

    <View
        android:id="@+id/arrow"
        android:elevation="2dp"
        android:layout_width="10dp"
        android:layout_height="8dp"
        android:layout_marginTop="-2dp"
        android:layout_gravity="center_horizontal"/>
</merge>
+14 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" >

    <com.android.launcher3.appprediction.PredictionRowView
        android:id="@+id/prediction_row"
        android:accessibilityPaneTitle="@string/title_app_suggestions"
        android:layout_width="match_parent"
        android:layout_height="wrap_content" />

    <com.android.launcher3.appprediction.AppsDividerView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:id="@+id/apps_divider_view" />
</merge>
+11 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android"
    style="?android:attr/progressBarStyleHorizontal"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_gravity="center"
    android:layout_marginLeft="20dp"
    android:layout_marginRight="20dp"
    android:indeterminate="true"
    android:indeterminateOnly="true"
    android:indeterminateTint="?workspaceTextColor" />
+5 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="chip_hint_foreground_color">#fff</color>

    <color name="all_apps_label_text">#61000000</color>
    <color name="all_apps_label_text_dark">#61FFFFFF</color>
    <color name="all_apps_prediction_row_separator">#3c000000</color>
    <color name="all_apps_prediction_row_separator_dark">#3cffffff</color>
</resources>
 No newline at end of file
Loading