PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-08 22:58:55 +00:00
committed by Android (Google) Code Review
parent fc8e64eccb 86d4d51b62
commit 2dbc30dc58
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/preference_category_material_settings.xml
View File

@@ -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"

2
res/xml/display_settings.xml
View File

@@ -119,7 +119,7 @@
<ListPreference
android:key="theme"
android:title="@string/device_theme"
android:summary="%s" />
android:summary="@string/summary_placeholder" />
<Preference
android:key="vr_display_pref"

5
src/com/android/settings/display/ThemePreferenceController.java
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);
}