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

Commit a2341af2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating the fast scroll bar UI" into ub-launcher3-dorval-polish

parents 301af8eb 1a8f6fb7

res/drawable-ldrtl/container_fastscroll_popup_bg.xml

deleted100644 → 0
+0 −27
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">

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

    <size

        android:width="64dp"

        android:height="64dp" />

    <corners

        android:topLeftRadius="64dp"

        android:topRightRadius="64dp"

        android:bottomRightRadius="64dp" />

</shape>
 
 No newline at end of file

res/drawable/container_fastscroll_popup_bg.xml

deleted100644 → 0
+0 −27
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">

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

    <size

        android:width="64dp"

        android:height="64dp" />

    <corners

        android:topLeftRadius="64dp"

        android:topRightRadius="64dp"

        android:bottomLeftRadius="64dp" />

</shape>
 
 No newline at end of file

res/layout/all_apps.xml

+3 −3
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ 
            android:overScrollMode="never"

            android:descendantFocusability="afterDescendants"

            android:focusable="true"

            android:paddingStart="@dimen/container_fastscroll_thumb_max_width"

            android:paddingEnd="@dimen/container_fastscroll_thumb_max_width" />

            android:paddingStart="@dimen/dynamic_grid_edge_margin"

            android:paddingEnd="@dimen/dynamic_grid_edge_margin" />



        <!-- Fast scroller popup -->

        <TextView
@@ -63,7 +63,7 @@ 
            android:layout_alignTop="@+id/apps_list_view"

            android:id="@+id/fast_scroller_popup"

            android:layout_alignParentEnd="true"

            android:layout_marginEnd="@dimen/container_fastscroll_popup_margin" />

            android:layout_marginEnd="@dimen/fastscroll_popup_margin" />



        <!-- Note: we are reusing/repurposing a system attribute for search layout, because of a

         platform bug, which prevents using custom attributes in <include> tag -->

res/layout/all_apps_discovery_item.xml

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

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

        android:paddingRight="@dimen/container_fastscroll_thumb_max_width"

        android:paddingLeft="@dimen/dynamic_grid_edge_margin"

        android:paddingRight="@dimen/dynamic_grid_edge_margin"

        android:src="@drawable/all_apps_divider"

        android:scaleType="fitXY"

        android:focusable="false" />

res/layout/all_apps_discovery_loading_divider.xml

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="6dp"

    android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

    android:paddingRight="@dimen/container_fastscroll_thumb_max_width">

    android:paddingLeft="@dimen/dynamic_grid_edge_margin"

    android:paddingRight="@dimen/dynamic_grid_edge_margin">



    <ProgressBar

        android:id="@+id/loadingProgressBar"