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

Commit b655b885 authored by Winson's avatar Winson Committed by Peter Schiller
Browse files

Cleaning up scrollbar logic to properly calculate stable extents. 

- Removing old logic which assumed that views were the same size,
  especially now we can have variable dividers, etc.
- Simplifying old scroll position logic.
- Removing unnecessary prediction icon layout (same as normal icon)

Bug: 30023608
Change-Id: I39e1126fa586a76a9bdd3ff38cd6e360ac3021e6
parent 7ed42af3

res/drawable/all_apps_divider.xml

0 → 100644
+20 −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.

-->

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

       android:shape="rectangle">

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

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

</shape>
 
 No newline at end of file

res/drawable/all_apps_search_divider.xml

0 → 100644
+20 −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.

-->

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

       android:shape="rectangle">

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

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

</shape>
 
 No newline at end of file

res/layout/all_apps_divider.xml

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

     limitations under the License.

-->

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

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

    android:importantForAccessibility="no"

    android:layout_width="match_parent"

    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:layout_height="wrap_content"

    android:paddingTop="@dimen/all_apps_divider_margin_vertical"

    android:paddingBottom="@dimen/all_apps_divider_margin_vertical"

    android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

    android:paddingRight="@dimen/container_fastscroll_thumb_max_width"

    android:src="@drawable/all_apps_divider"

    android:scaleType="fitXY"

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

res/layout/all_apps_prediction_bar_icon.xml→res/layout/all_apps_search_divider.xml

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

     limitations under the License.

-->

<com.android.launcher3.BubbleTextView

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

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

    style="@style/Icon.AllApps"

    android:id="@+id/icon"

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

    android:importantForAccessibility="no"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    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" />

    android:paddingBottom="@dimen/all_apps_divider_margin_vertical"

    android:paddingLeft="@dimen/container_fastscroll_thumb_max_width"

    android:paddingRight="@dimen/container_fastscroll_thumb_max_width"

    android:src="@drawable/all_apps_search_divider"

    android:scaleType="fitXY"

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

res/values/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 
    <dimen name="all_apps_header_scroll_to_elevation">16dp</dimen>

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



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

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



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