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

Commit c7931674 authored by Jon Miranda's avatar Jon Miranda
Browse files

Update deep shortcut to new ui. 

- Removed divider views, using margin to separate views
- Removed elevations
- Added a ViewGroup to hold all notification views, and applied an outline

Bug: 175329686
Test: visual
Change-Id: Iad70dcfdaeba6050c2b17c07f76bb7bfb728e544
parent a79c7e42

res/drawable/middle_item_primary.xml

0 → 100644
+20 −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.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/popupColorPrimary"/>

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

</shape>
 
 No newline at end of file

res/drawable/single_item_primary.xml

0 → 100644
+20 −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.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/popupColorPrimary"/>

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

</shape>
 
 No newline at end of file

res/drawable/single_item_secondary.xml

0 → 100644
+20 −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.

-->

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

    android:shape="rectangle">

    <solid android:color="?attr/popupColorSecondary"/>

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

</shape>
 
 No newline at end of file

res/layout/deep_shortcut.xml

+1 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
    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:background="@drawable/middle_item_primary"

    android:theme="@style/PopupItem" >



    <com.android.launcher3.shortcuts.DeepShortcutTextView
@@ -45,12 +46,4 @@ 
        android:layout_gravity="start|center_vertical"

        android:background="@drawable/ic_deepshortcut_placeholder"/>



    <View

        android:id="@+id/divider"

        android:layout_width="@dimen/deep_shortcuts_divider_width"

        android:layout_height="@dimen/popup_item_divider_height"

        android:layout_gravity="end|bottom"

        android:visibility="gone"

        android:background="?attr/popupColorTertiary" />



</com.android.launcher3.shortcuts.DeepShortcutView>

res/layout/longpress_options_menu.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    android:id="@+id/deep_shortcuts_container"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="?attr/popupColorPrimary"

    android:clipToPadding="false"

    android:clipChildren="false"

    android:elevation="@dimen/deep_shortcuts_elevation"