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

Commit eb500d53 authored by Samuel Fufa's avatar Samuel Fufa
Browse files

[AllApps] Polish views according to specs 

Bug: 196391749 Update work edu button stroke color
Bug: 195497351 Update header font size for work apps paused state
Bug: 192673256 Show ArrowTip elevation
Bug: 192668800 Support for two line PopupOption view
Test: visual
Change-Id: I65f8c6152f54306756d6cb66de2581aff45b8d47
Merged-In: I65f8c6152f54306756d6cb66de2581aff45b8d47
parent a3436997

res/drawable/padded_rounded_action_button.xml

+3 −10
Original line number Diff line number Diff line
@@ -14,18 +14,11 @@ 
  ~ limitations under the License.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android"

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

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:drawable="@drawable/rounded_action_button"

        android:left="@dimen/padded_rounded_button_padding"

        android:top="@dimen/padded_rounded_button_padding"

        android:right="@dimen/padded_rounded_button_padding"

        android:bottom="@dimen/padded_rounded_button_padding">

        <shape android:shape="rectangle">

            <corners android:radius="@dimen/rounded_button_radius" />

            <stroke android:width="1dp"

                android:color="?androidprv:attr/colorAccentPrimaryVariant" />

        </shape>

    </item>

        android:bottom="@dimen/padded_rounded_button_padding" />

</layer-list>

res/drawable/rounded_action_button.xml

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ 
    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"

    android:shape="rectangle">

    <corners android:radius="@dimen/rounded_button_radius" />

    <stroke android:width="1dp" android:color="@color/all_apps_tab_background_selected" />

    <stroke

        android:width="1dp"

        android:color="?androidprv:attr/colorAccentPrimaryVariant" />

    <padding

        android:left="@dimen/rounded_button_padding"

        android:right="@dimen/rounded_button_padding" />

res/layout/arrow_toast.xml

+2 −4
Original line number Diff line number Diff line
@@ -27,15 +27,13 @@ 
        android:gravity="center"

        android:padding="16dp"

        android:background="@drawable/arrow_toast_rounded_background"

        android:elevation="2dp"

        android:outlineProvider="none"

        android:elevation="@dimen/arrow_toast_elevation"

        android:textColor="@color/arrow_tip_view_content"

        android:textSize="14sp"/>



    <View

        android:id="@+id/arrow"

        android:elevation="2dp"

        android:outlineProvider="none"

        android:elevation="@dimen/arrow_toast_elevation"

        android:layout_width="@dimen/arrow_toast_arrow_width"

        android:layout_height="10dp"/>

</merge>

res/layout/system_shortcut.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

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

    android:layout_width="@dimen/bg_popup_item_width"

    android:layout_height="@dimen/bg_popup_item_height"

    android:layout_height="wrap_content"

    android:minHeight="@dimen/bg_popup_item_height"

    android:elevation="@dimen/deep_shortcuts_elevation"

    android:background="@drawable/middle_item_primary"

    android:theme="@style/PopupItem" >

res/layout/system_shortcut_content.xml

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

<!-- Copyright (C) 2021 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"

    xmlns:launcher="http://schemas.android.com/apk/res-auto" >



    <com.android.launcher3.BubbleTextView

        style="@style/BaseIconUnBounded"

        android:id="@+id/bubble_text"

        android:background="?android:attr/selectableItemBackground"

        android:gravity="start|center_vertical"

        android:paddingTop="@dimen/bg_popup_item_vertical_padding"

        android:paddingBottom="@dimen/bg_popup_item_vertical_padding"

        android:minHeight="@dimen/bg_popup_item_height"

        android:textAlignment="viewStart"

        android:paddingStart="@dimen/deep_shortcuts_text_padding_start"

        android:paddingEnd="@dimen/popup_padding_end"

        android:textSize="14sp"

        android:minLines="1"

        android:maxLines="2"

        android:ellipsize="end"

        android:textColor="?android:attr/textColorPrimary"

        launcher:iconDisplay="shortcut_popup"

        launcher:layoutHorizontal="true"

        android:focusable="false" />



    <View

        android:id="@+id/icon"

        android:layout_width="@dimen/system_shortcut_icon_size"

        android:layout_height="@dimen/system_shortcut_icon_size"

        android:layout_marginStart="@dimen/system_shortcut_margin_start"

        android:layout_gravity="start|center_vertical"

        android:backgroundTint="?android:attr/textColorPrimary"/>

</merge>