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

Commit 7d2fc812 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Add caret shaped all app pull up handle to page indicator. 

b/28917826

> PageIndicator is also added in landscape
> Touch delegate allows the active touch area to be 36dp

Change-Id: If00f45fc88a13cd5a6759d771313439eb58561e3
parent b25b2c41

res/drawable/ic_allapps_caret.xml

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

<!--

     Copyright (C) 2016 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:height="24dp"

    android:viewportHeight="48.0"

    android:viewportWidth="48.0"

    android:width="24dp" >

    <path

        android:fillColor="#FFFFFF"

        android:pathData="M14.83,30.83L24,21.66l9.17,9.17L36,28 24,16 12,28z"/>

</vector>

res/layout-land/launcher.xml

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ 
            android:id="@+id/overview_panel"

            android:visibility="gone" />



        <com.android.launcher3.pageindicators.PageIndicatorCaretLandscape

            android:id="@+id/page_indicator"

            android:layout_width="48dp"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height"

            android:layout_gravity="bottom|left"/>



        <include layout="@layout/widgets_view"

            android:id="@+id/widgets_view"

            android:layout_width="match_parent"

res/layout-port/launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

        <com.android.launcher3.pageindicators.PageIndicatorLine

        <com.android.launcher3.pageindicators.PageIndicatorLineCaret

            android:id="@+id/page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height" />

res/layout-sw720dp/launcher.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 


        <!-- Keep these behind the workspace so that they are not visible when

             we go into AllApps -->

        <com.android.launcher3.pageindicators.PageIndicatorLine

        <com.android.launcher3.pageindicators.PageIndicatorLineCaret

            android:id="@+id/page_indicator"

            android:layout_width="match_parent"

            android:layout_height="@dimen/dynamic_grid_page_indicator_height" />

res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ 
<resources>

<!-- Dynamic Grid -->

    <dimen name="dynamic_grid_edge_margin">6dp</dimen>

    <dimen name="dynamic_grid_page_indicator_height">1dp</dimen>

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

    <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>

    <dimen name="dynamic_grid_page_indicator_extra_touch_height">12dp</dimen>

    <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen>

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

    <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen>