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

Commit d96072e6 authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing horizontal bar from page indicator" into ub-launcher3-master

parents de5535a1 e969c68c

res/drawable/all_apps_handle_landscape.xml

+20 −17
Original line number Diff line number Diff line
@@ -15,11 +15,14 @@ 
-->



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

    android:width="13dp"

    android:height="13dp"

    android:viewportWidth="13.0"

    android:viewportHeight="13.0" >

    android:width="@dimen/dynamic_grid_min_page_indicator_size"

    android:height="@dimen/dynamic_grid_min_page_indicator_size"

    android:viewportWidth="48.0"

    android:viewportHeight="48.0" >



    <group

        android:translateX="17.5"

        android:translateY="17.5">

        <path

            android:pathData="M2 8.5L6.5 4L11 8.5"

            android:strokeColor="?attr/workspaceAmbientShadowColor"
@@ -33,5 +36,5 @@ 
            android:strokeWidth="2"

            android:strokeLineCap="round"

            android:strokeLineJoin="round" />



        </group>

</vector>

res/drawable/all_apps_handle_portrait.xml

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

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

-->



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

    android:width="16dp"

    android:height="13dp"

    android:viewportWidth="16.0"

    android:viewportHeight="13.0" >



    <path

        android:pathData="M2 6h12"

        android:strokeColor="?attr/workspaceAmbientShadowColor"

        android:strokeWidth="4"

        android:strokeLineCap="round" />



    <path

        android:pathData="M2 6h12"

        android:strokeColor="?attr/workspaceTextColor"

        android:strokeWidth="2"

        android:strokeLineCap="round" />

</vector>
 
 No newline at end of file

res/layout-land/launcher.xml

+2 −7
Original line number Diff line number Diff line
@@ -47,13 +47,8 @@ 
            android:theme="@style/HomeScreenElementTheme"

            android:layout_width="@dimen/dynamic_grid_min_page_indicator_size"

            android:layout_height="@dimen/dynamic_grid_min_page_indicator_size"

            android:layout_gravity="bottom|left">

            <ImageView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:src="@drawable/all_apps_handle_landscape"

                android:layout_gravity="center" />

        </com.android.launcher3.pageindicators.PageIndicatorLandscape>

            android:layout_gravity="bottom|left"

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



        <include layout="@layout/gradient_bg" />

res/layout/page_indicator.xml

+1 −9
Original line number Diff line number Diff line
@@ -18,12 +18,4 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:theme="@style/HomeScreenElementTheme"

    android:layout_width="match_parent"

    android:layout_height="@dimen/dynamic_grid_min_page_indicator_size">

        <ImageView

            android:id="@+id/all_apps_handle"

            android:layout_width="48dp"

            android:layout_height="@dimen/dynamic_grid_min_page_indicator_size"

            android:src="@drawable/all_apps_handle_portrait"

            android:layout_gravity="top|center"

            android:scaleType="centerInside"/>

</com.android.launcher3.pageindicators.PageIndicatorLine>
 
    android:layout_height="@dimen/dynamic_grid_min_page_indicator_size" />

res/values-sw720dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
-->



<resources>

    <!-- Dynamic Grid -->

    <dimen name="dynamic_grid_min_page_indicator_size">24dp</dimen>



    <!-- All Apps -->

    <dimen name="all_apps_button_scale_down">8dp</dimen>

    <dimen name="all_apps_empty_search_message_top_offset">64dp</dimen>