Make preference title align after icon

- Running service should use app preference layout.
- RestrictedDropdownPreference should use preference layout.
- Tweek Storage item icon padding
- Wifi calling should use Prefernce
- In Open by default page, if there is no vierfied link, we should
  hide the checkbox.

Bug: 186069482
Test: manual
Change-Id: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
Merged-In: Icc186ad79fc2bcf7ecd9c1ebba747bdad2d9b9ad
This commit is contained in:
Edgar Wang
2021-05-18 15:46:52 +08:00
parent 3d867d50f5
commit 600d023892
6 changed files with 7 additions and 21 deletions

View File

@@ -26,6 +26,6 @@
android:visibility="invisible" android:visibility="invisible"
android:layout_marginStart="@dimen/preference_no_icon_padding_start"/> android:layout_marginStart="@dimen/preference_no_icon_padding_start"/>
<include layout="@layout/preference_material" /> <include layout="@layout/settingslib_preference" />
</FrameLayout> </FrameLayout>

View File

@@ -31,5 +31,5 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_toStartOf="@id/widget_summary" android:layout_toStartOf="@id/widget_summary"
layout="@layout/preference_material"/> layout="@layout/preference_app"/>
</RelativeLayout> </RelativeLayout>

View File

@@ -35,22 +35,7 @@
android:clipToPadding="false" android:clipToPadding="false"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"> android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<LinearLayout <include layout="@layout/settingslib_icon_frame"/>
android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:minWidth="56dp"
android:orientation="horizontal"
android:paddingTop="4dp"
android:paddingBottom="4dp">
<com.android.internal.widget.PreferenceImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="24dp"
android:maxHeight="24dp"/>
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

View File

@@ -59,6 +59,7 @@
<style name="SettingsMultiSelectListPreference" parent="@style/Preference.Material"> <style name="SettingsMultiSelectListPreference" parent="@style/Preference.Material">
<item name="android:positiveButtonText">@android:string/ok</item> <item name="android:positiveButtonText">@android:string/ok</item>
<item name="android:negativeButtonText">@android:string/cancel</item> <item name="android:negativeButtonText">@android:string/cancel</item>
<item name="iconSpaceReserved">@bool/settingslib_config_icon_space_reserved</item>
</style> </style>
<style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material"> <style name="SettingsPreferenceFragmentStyle" parent="@style/PreferenceFragment.Material">

View File

@@ -162,7 +162,7 @@
android:title="@string/call_category" android:title="@string/call_category"
settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController"> settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">
<PreferenceScreen <Preference
android:key="wifi_calling" android:key="wifi_calling"
android:title="@string/wifi_calling_settings_title" android:title="@string/wifi_calling_settings_title"
android:summary="@string/wifi_calling_summary" android:summary="@string/wifi_calling_summary"
@@ -172,7 +172,7 @@
android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity"> android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
<extra android:name="show_drawer_menu" android:value="true"/> <extra android:name="show_drawer_menu" android:value="true"/>
</intent> </intent>
</PreferenceScreen> </Preference>
<SwitchPreference <SwitchPreference
android:key="video_calling_key" android:key="video_calling_key"

View File

@@ -89,7 +89,7 @@ public class VerifiedLinksPreference extends TwoTargetPreference {
CheckBox checkBox = (CheckBox) view.findViewById(com.android.internal.R.id.checkbox); CheckBox checkBox = (CheckBox) view.findViewById(com.android.internal.R.id.checkbox);
if (checkBox != null) { if (checkBox != null) {
checkBox.setChecked(true); checkBox.setChecked(true);
checkBox.setVisibility(mShowCheckBox ? View.VISIBLE : View.INVISIBLE); checkboxContainer.setVisibility(mShowCheckBox ? View.VISIBLE : View.GONE);
} }
} }
} }