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

Commit 15408704 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "[Expressive design] only apply paddingVertical after v36" into main

parents dce28541 b992ba87
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@
        android:layout_height="wrap_content"
        android:layout_gravity="center"
        android:gravity="center_vertical"
        android:paddingVertical="@dimen/settingslib_expressive_space_extrasmall4"
        android:paddingVertical="@dimen/settingslib_illustration_vertical_padding"
        android:paddingHorizontal="@dimen/settingslib_illustration_padding"
        android:orientation="vertical">

+21 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2025 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.
  -->

<resources>
    <!-- Padding of illustration -->
    <dimen name="settingslib_illustration_vertical_padding">@dimen/settingslib_expressive_space_extrasmall4</dimen>
</resources>
+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@
<resources>
    <!-- Padding of illustration -->
    <dimen name="settingslib_illustration_padding">16dp</dimen>
    <dimen name="settingslib_illustration_vertical_padding">0dp</dimen>

    <dimen name="settingslib_illustration_width">412dp</dimen>
    <dimen name="settingslib_illustration_height">300dp</dimen>