Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58 (0498d4e8) · Commits · e / os / android_packages_apps_Settings

res/layout/preference_category_material_settings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingStart="60dp"
		android:paddingStart="56dp"
		android:orientation="vertical">
		<TextView
		android:id="@android:id/title"

+1 −1

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@
		<ListPreference
		android:key="theme"
		android:title="@string/device_theme"
		android:summary="%s" />
		android:summary="@string/summary_placeholder" />

		<Preference
		android:key="vr_display_pref"

+3 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,6 @@
		*/
		package com.android.settings.display;

		import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;

		import android.content.Context;
		import android.content.om.IOverlayManager;
		import android.content.om.OverlayInfo;
		@@ -39,6 +37,8 @@ import libcore.util.Objects;
		import java.util.ArrayList;
		import java.util.List;

		import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;

		public class ThemePreferenceController extends PreferenceController implements
		Preference.OnPreferenceChangeListener {

		@@ -94,6 +94,7 @@ public class ThemePreferenceController extends PreferenceController implements
		theme = mContext.getString(R.string.default_theme);
		pref.setSummary(theme);
		}
		pref.setSummary(theme);
		pref.setValue(theme);
		}