Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
am: df2ecdf3f0
Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index de53ce2..5a1043d 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -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"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index af7f20b..655243f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -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"
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index b535993..99a19f8 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -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 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 @@
theme = mContext.getString(R.string.default_theme);
pref.setSummary(theme);
}
+ pref.setSummary(theme);
pref.setValue(theme);
}