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

Commit 18ffb5bf authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge remote-tracking branch 'origin/lineage-21.0' into v1-u

parents a6c994c7 8f921063

res/layout/dark_mode_section_view.xml

+5 −2
Original line number Diff line number Diff line
@@ -33,14 +33,17 @@ 
        android:text="@string/mode_title"

        style="@style/SectionTitleTextStyle" />



    <Switch

    <com.google.android.material.materialswitch.MaterialSwitch

        android:id="@+id/dark_mode_toggle"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="@null"

        android:clickable="false"

        android:focusable="false"

        android:theme="@style/Theme.Material3.DynamicColors.DayNight"

        android:minHeight="0dp"

        style="@style/Switch.SettingsLib" />

        android:text=""

        android:textOn=""

        android:textOff="" />



</com.android.customization.picker.mode.DarkModeSectionView>

res/layout/font_preview_card.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/preview_theme_content_max_height"

        android:layout_marginTop="@dimen/preview_theme_content_margin"

        android:layout_marginBottom="@dimen/preview_theme_content_margin"

        android:clipChildren="false"

        android:importantForAccessibility="noHideDescendants">

res/layout/font_section_view.xml

+8 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<com.android.customization.picker.font.FontSectionView

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

    android:orientation="horizontal"

    android:paddingBottom="@dimen/section_bottom_padding"

    android:paddingHorizontal="@dimen/section_horizontal_padding"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">

    android:background="?selectableItemBackground"

    android:clickable="true"

    android:paddingVertical="@dimen/option_section_vertical_padding"

    android:paddingHorizontal="@dimen/section_horizontal_padding"

    android:orientation="horizontal">



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center"

        android:orientation="vertical">



        <TextView
@@ -32,7 +34,7 @@ 
        android:layout_width="@dimen/option_tile_width"

        android:layout_height="@dimen/option_tile_width"

        android:scaleType="center"

        android:background="@drawable/option_border_color">

        android:background="@drawable/picker_section_icon_background">

        <TextView

            android:id="@+id/thumbnail_text"

            android:layout_width="wrap_content"

res/layout/grid_section_view.xml

+22 −10
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
-->

<com.android.customization.picker.grid.ui.view.GridSectionView

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:background="?selectableItemBackground"

    android:clickable="true"

    android:paddingBottom="@dimen/section_bottom_padding"

    android:paddingVertical="@dimen/option_section_vertical_padding"

    android:paddingHorizontal="@dimen/section_horizontal_padding"

    android:orientation="horizontal">
@@ -28,7 +28,7 @@ 
        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="center_vertical"

        android:layout_gravity="center"

        android:orientation="vertical">



        <TextView
@@ -44,14 +44,26 @@ 
            style="@style/SectionSubtitleTextStyle"/>

    </LinearLayout>



    <ImageView

        android:id="@+id/grid_section_tile"

    <LinearLayout

        android:layout_width="@dimen/option_tile_width"

        android:layout_height="@dimen/option_tile_width"

        android:orientation="horizontal"

        android:background="@drawable/picker_section_icon_background"

        android:contentDescription="@string/gird_picker_entry_content_description"

        android:importantForAccessibility="noHideDescendants"

        android:gravity="center"

        android:divider="@drawable/horizontal_divider_14dp"

        android:layout_gravity="center"

        android:showDividers="middle">



        <ImageView

            android:id="@+id/grid_section_tile"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:scaleType="center"

            android:src="@drawable/ic_grid_24px"

        android:tint="@color/system_on_surface"

        android:background="@drawable/picker_section_icon_background"

        android:contentDescription="@string/gird_picker_entry_content_description" />

            android:tint="@color/system_on_surface" />



    </LinearLayout>



</com.android.customization.picker.grid.ui.view.GridSectionView>

res/layout/icon_preview_card.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
        android:layout_width="match_parent"

        android:layout_height="@dimen/preview_theme_content_max_height"

        android:layout_marginTop="@dimen/preview_theme_content_margin"

        android:layout_marginBottom="@dimen/preview_theme_content_margin"

        android:clipChildren="false"

        android:importantForAccessibility="noHideDescendants">