summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Peter_Liang <peterliang@google.com> 2022-07-25 12:25:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-07-25 12:25:25 +0000
commitd893c95f56d6a81c6eeec8dea3345275f37e09be (patch)
treea1e57cc52f92b3eff63461d2475aff556f4eacf1
parentac1e6d545b7d2e3438e2468e78ad092a6fa9057a (diff)
parent0e8aff720e75da7c0fe8b968447a6fbfaf245162 (diff)
[DO NOT MERGE]Fix the inconsistent alignment of the main switch preference. am: 0e8aff720e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19357050 Change-Id: Icad14e69938e939dd988a68f41284b8a049476eb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
index d2a4de4aa86f..b9a6ecc8adf9 100644
--- a/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
+++ b/packages/SettingsLib/MainSwitchPreference/res/layout-v31/settingslib_main_switch_bar.xml
@@ -20,6 +20,11 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:background="?android:attr/colorBackground"
+ 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">
<LinearLayout
@@ -27,7 +32,6 @@
android:minHeight="@dimen/settingslib_min_switch_bar_height"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_margin="@dimen/settingslib_switchbar_margin"
android:paddingStart="@dimen/settingslib_switchbar_padding_left"
android:paddingEnd="@dimen/settingslib_switchbar_padding_right">