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

Commit 412821fa authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Create an alpha letter scroller" into main

parents cc22b621 1f8f8869

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -332,3 +332,10 @@ flag { 
      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "letter_fast_scroller"

    namespace: "launcher"

    description: "Change fast scroller to a lettered list"

    bug: "358673724"

}

res/drawable/bg_letter_list_text.xml

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

  ~ Copyright (C) 2024 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="oval">

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

    <corners android:radius="100dp"/>

    <size

        android:width="@dimen/bg_letter_list_text_size"

        android:height="@dimen/bg_letter_list_text_size"/>

</shape>
 
 No newline at end of file

res/layout/all_apps_fast_scroller.xml

+13 −0
Original line number Diff line number Diff line
@@ -36,4 +36,17 @@ 
        android:layout_marginEnd="@dimen/fastscroll_end_margin"

        launcher:canThumbDetach="true" />



    <androidx.constraintlayout.widget.ConstraintLayout

        android:id="@+id/scroll_letter_layout"

        android:layout_width="@dimen/fastscroll_width"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:layout_alignTop="@+id/all_apps_header"

        android:layout_marginTop="@dimen/all_apps_header_bottom_padding"

        android:layout_marginEnd="@dimen/fastscroll_list_letter_end_margin"

        android:clipToPadding="false"

        android:outlineProvider="none"

        />

</merge>
 
 No newline at end of file

res/layout/fast_scroller_letter_list_text_view.xml

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

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

  -->



<com.android.launcher3.allapps.LetterListTextView xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="@dimen/fastscroll_list_letter_size"

    android:layout_height="@dimen/fastscroll_list_letter_size"

    android:textSize="@dimen/fastscroll_list_letter_text_size"

    android:importantForAccessibility="no"

    android:gravity="center"

    android:clickable="false">

</com.android.launcher3.allapps.LetterListTextView>
 
 No newline at end of file

res/values/dimens.xml

+5 −0
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ 
    <dimen name="fastscroll_popup_text_size">32dp</dimen>

    <dimen name="fastscroll_popup_margin">19dp</dimen>



    <dimen name="fastscroll_list_letter_size">5dp</dimen>

    <dimen name="fastscroll_list_letter_text_size">14sp</dimen>

    <dimen name="fastscroll_list_letter_end_margin">-10dp</dimen>

    <dimen name="bg_letter_list_text_size">20sp</dimen>



    <!--

      Fast scroller draws the content horizontally centered. The end of the track should be

      aligned at the end of the container.