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

Commit c8617ccd authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Update the padding of MainSwitch layout and the MainSwitch's TextView... 

Merge "Update the padding of MainSwitch layout and the MainSwitch's TextView margin to meet the spec." into sc-v2-dev am: 20e71a63

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16387797

Change-Id: Ifc51df9c136e526dd076895f355b5636ea7e08f3
parents 34c920b6 20e71a63

packages/SettingsLib/MainSwitchPreference/res/values-v31/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
    <dimen name="settingslib_switchbar_margin">16dp</dimen>



    <!-- Size of layout margin left -->

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

    <dimen name="settingslib_switchbar_padding_left">20dp</dimen>



    <!-- Size of layout margin right -->

    <dimen name="settingslib_switchbar_padding_right">16dp</dimen>

    <dimen name="settingslib_switchbar_padding_right">20dp</dimen>



    <!-- Minimum width of switch -->

    <dimen name="settingslib_min_switch_width">52dp</dimen>

packages/SettingsLib/MainSwitchPreference/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    <dimen name="settingslib_restricted_icon_margin_end">16dp</dimen>



    <!-- Size of title margin -->

    <dimen name="settingslib_switch_title_margin">16dp</dimen>

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



    <!-- SwitchBar sub settings margin start / end -->

    <dimen name="settingslib_switchbar_subsettings_margin_start">72dp</dimen>