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

Commit b1114a98 authored by Samuel Fufa's avatar Samuel Fufa Committed by Android (Google) Code Review
Browse files

Merge "[Search] Update all apps header protection" into sc-dev

parents 749f55f0 76b33404

res/drawable/all_apps_tabs_background.xml

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

     limitations under the License.

-->

<shape android:shape="rectangle"

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

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

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

    <item

        android:top="6dp"

        android:bottom="6dp">

        <shape android:shape="rectangle">

            <solid android:color="?androidprv:attr/colorSurface" />

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

        </shape>

    </item>

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

res/layout/all_apps_personal_work_tabs.xml

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


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

    android:id="@+id/tabs"

    android:layout_width="match_parent"

    android:layout_width="@dimen/all_apps_header_pills_width"

    android:layout_height="@dimen/all_apps_header_pill_height"

    android:layout_gravity="center_horizontal"

    android:background="@drawable/all_apps_tabs_background"

    android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"

    android:layout_marginRight="@dimen/all_apps_tabs_side_padding"

    android:orientation="horizontal"

    android:elevation="2dp"

    style="@style/TextHeadline">

res/layout/secondary_launcher.xml

+0 −2
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ 
                android:id="@+id/tabs"

                android:layout_width="match_parent"

                android:layout_height="@dimen/all_apps_header_pill_height"

                android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"

                android:layout_marginRight="@dimen/all_apps_tabs_side_padding"

                android:orientation="horizontal"

                style="@style/TextHeadline">

res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


    <!-- Attributes used for launcher theme -->

    <attr name="allAppsScrimColor" format="color" />

    <attr name="allappsHeaderProtectionColor" format="color" />

    <attr name="allAppsNavBarScrimColor" format="color" />

    <attr name="allAppsTheme" format="reference" />

    <attr name="popupColorPrimary" format="color" />

res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
** limitations under the License.

*/

-->

<resources>

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

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

    <!-- The color tints to apply to the text and drag view when hovering

         over the delete target or the info target -->

    <color name="delete_target_hover_tint">#FFC1C1C1</color>
@@ -61,5 +62,4 @@ 


    <color name="wallpaper_popup_scrim">?android:attr/colorAccent</color>

    <color name="wallpaper_scrim_color">#0D878787</color>



</resources>