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

Commit 50f1ff18 authored by Steven Ng's avatar Steven Ng
Browse files

Update all apps & widget pickers personal / work tabs 

Test: Open all apps to confirm tab style match the mock in both dark &
      light mode.
      Open widgets picker to confirm tab style match the mock in both
      dark & light mode.
Bug: 191387242
Change-Id: Ie0111f65813128fef5befbdefd451cf0e9f01be9
parent e0378447

res/color-night-v31/all_apps_tabs_background.xml

deleted100644 → 0
+0 −18
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.

-->

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

    <item android:color="@android:color/system_neutral2_100"/>

</selector>
 
 No newline at end of file

res/color-night/all_apps_tabs_background.xml

deleted100644 → 0
+0 −18
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.

-->

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

    <item android:color="#E2E2E2"/>

</selector>
 
 No newline at end of file

res/drawable/all_apps_tabs_background.xml

+19 −5
Original line number Diff line number Diff line
@@ -13,13 +13,27 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    android:enterFadeDuration="500">

    <item

        android:top="@dimen/all_apps_tabs_vertical_padding"

        android:bottom="@dimen/all_apps_tabs_vertical_padding">

        android:id="@+id/unselected"

        android:state_selected="false">

        <ripple android:color="@color/all_apps_tab_background_selected">

            <item>

                <shape android:shape="rectangle">

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

                    <solid android:color="@color/all_apps_tabs_background" />

                </shape>

            </item>

        </ripple>

    </item>



    <item

        android:id="@+id/selected"

        android:state_selected="true">

        <shape android:shape="rectangle">

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

            <solid android:color="@color/all_apps_tab_background_selected" />

        </shape>

    </item>

</layer-list>
 
 No newline at end of file
 
</selector>
 
 No newline at end of file

res/layout/all_apps_personal_work_tabs.xml

+13 −7
Original line number Diff line number Diff line
@@ -14,12 +14,12 @@ 
  ~ limitations under the License.

-->



<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip xmlns:android="http://schemas.android.com/apk/res/android"

<com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip

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

    android:id="@+id/tabs"

    android:layout_width="@dimen/all_apps_header_pills_width"

    android:layout_width="match_parent"

    android:layout_height="@dimen/all_apps_header_pill_height"

    android:layout_gravity="center_horizontal"

    android:background="@drawable/all_apps_tabs_background"

    android:orientation="horizontal"

    style="@style/TextHeadline">
@@ -27,19 +27,25 @@ 
        android:id="@+id/tab_personal"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_marginEnd="@dimen/all_apps_tabs_button_horizontal_padding"

        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"

        android:layout_weight="1"

        android:background="@drawable/personal_work_tabs_ripple"

        android:background="@drawable/all_apps_tabs_background"

        android:text="@string/all_apps_personal_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="14sp" />

        android:textSize="14sp"

        style="?android:attr/borderlessButtonStyle" />



    <Button

        android:id="@+id/tab_work"

        android:layout_width="0dp"

        android:layout_height="match_parent"

        android:layout_marginStart="@dimen/all_apps_tabs_button_horizontal_padding"

        android:layout_marginVertical="@dimen/all_apps_tabs_vertical_padding"

        android:layout_weight="1"

        android:background="@drawable/personal_work_tabs_ripple"

        android:background="@drawable/all_apps_tabs_background"

        android:text="@string/all_apps_work_tab"

        android:textColor="@color/all_apps_tab_text"

        android:textSize="14sp" />

        android:textSize="14sp"

        style="?android:attr/borderlessButtonStyle" />

</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>
 
 No newline at end of file

res/layout/widgets_full_sheet_search_and_recommendations.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
        android:id="@+id/recommended_widget_table"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="16dp"

        android:layout_marginHorizontal="@dimen/widget_list_horizontal_margin"

        android:layout_marginTop="8dp"

        android:background="@drawable/widgets_recommendation_background"

        android:paddingVertical="@dimen/recommended_widgets_table_vertical_padding"