Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev

am: 2dbc30dc58

Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
This commit is contained in:
Fan Zhang
2017-05-08 23:08:31 +00:00
committed by android-build-merger
3 changed files with 5 additions and 4 deletions

View File

@@ -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);
}