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

Commit 2ccb7efe authored by Edgar Wang's avatar Edgar Wang
Browse files

[Expressive Design] Update MainSwitchBar padding 

- only Expressive design enable to apply new layout

Bug: 366336385
Test: visual
Flag: EXEMPT resource only update
Change-Id: Id13f5e8373ec038afc61a07f1d97d2417d953ce2
parent 4a87d601

packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingTop="@dimen/settingslib_switchbar_margin"

    android:paddingBottom="@dimen/settingslib_switchbar_margin"

    android:orientation="vertical">

packages/SettingsLib/MainSwitchPreference/res/layout-v33/settingslib_main_switch_bar.xml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:minHeight="?android:attr/listPreferredItemHeight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingTop="@dimen/settingslib_switchbar_margin"

    android:paddingBottom="@dimen/settingslib_switchbar_margin"

    android:orientation="vertical">

packages/SettingsLib/MainSwitchPreference/res/layout-v35/settingslib_expressive_main_switch_layout.xml

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

  -->



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

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:importantForAccessibility="no">



    <com.android.settingslib.widget.MainSwitchBar

        android:id="@+id/settingslib_main_switch_bar"

        android:visibility="gone"

        android:layout_height="wrap_content"

        android:layout_width="match_parent" />



</FrameLayout>

packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_bar.xml

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ 
<LinearLayout

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

    android:layout_height="wrap_content"

    android:layout_width="match_parent">

    android:layout_width="match_parent"

    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingRight="?android:attr/listPreferredItemPaddingRight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <TextView

        android:id="@+id/switch_text"

packages/SettingsLib/MainSwitchPreference/res/layout/settingslib_main_switch_layout.xml

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ 
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_height="wrap_content"

    android:layout_width="match_parent"

    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingRight="?android:attr/listPreferredItemPaddingRight"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:importantForAccessibility="no">



    <com.android.settingslib.widget.MainSwitchBar