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

Commit c9b6d843 authored by Peter Schiller's avatar Peter Schiller Committed by Android (Google) Code Review
Browse files

Merge "Consolidate all the dividers to provide same look and feel" into ub-launcher3-calgary

parents b30562da c2a20ff0

res/drawable/all_apps_search_bg.xml

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

<!--

     Copyright (C) 2015 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.

-->

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

    <item

        android:top="@dimen/all_apps_search_bar_bg_overflow"

        android:left="@dimen/all_apps_search_bar_bg_overflow"

        android:right="@dimen/all_apps_search_bar_bg_overflow"

        android:bottom="0dp">



        <shape android:shape="rectangle">

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

            <stroke

                android:width="@dimen/all_apps_search_bar_divider_width"

                android:color="?android:attr/colorAccent"/>

        </shape>

    </item>

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

res/drawable/horizontal_line.xml

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

<!--

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

    <size android:height="1dp" />

    <solid android:color="#ddd" />

</shape>

res/layout/all_apps.xml

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
            android:layout_gravity="center|top"

            android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

            android:paddingRight="@dimen/container_fastscroll_thumb_max_width"

            android:background="@drawable/all_apps_search_bg"

            android:gravity="center|bottom"

            android:orientation="horizontal"

            android:saveEnabled="false">

res/layout/all_apps_search_market_divider.xml→res/layout/all_apps_divider.xml

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

     limitations under the License.

-->

<ImageView

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

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

    android:importantForAccessibility="no"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:gravity="center"

    android:paddingTop="16dp"

    android:paddingBottom="8dp"

    android:paddingLeft="16dp"

    android:paddingRight="16dp"

    android:focusable="false"

    android:scaleType="matrix"

    android:src="@drawable/horizontal_line" />
 
 No newline at end of file
 
    android:layout_height="@dimen/all_apps_divider_height"

    android:layout_marginBottom="@dimen/all_apps_divider_margin_vertical"

    android:layout_marginLeft="@dimen/container_fastscroll_thumb_max_width"

    android:layout_marginRight="@dimen/container_fastscroll_thumb_max_width"

    android:layout_marginTop="@dimen/all_apps_divider_margin_vertical"

    android:background="@color/all_apps_divider_color"

    android:focusable="false" />
 
 No newline at end of file

res/layout/all_apps_prediction_bar_icon.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:paddingTop="@dimen/all_apps_prediction_icon_top_padding"

    android:paddingBottom="@dimen/all_apps_prediction_icon_bottom_padding"

    android:paddingTop="@dimen/all_apps_icon_top_bottom_padding"

    android:paddingBottom="@dimen/all_apps_icon_top_bottom_padding"

    android:focusable="true"

    launcher:iconDisplay="all_apps" />