Cherish:Move QS tile style [2/2]

This commit is contained in:
Hưng Phan
2020-08-15 08:46:44 +07:00
parent 60f1b9dfe2
commit cc30dee945
4 changed files with 35 additions and 3 deletions

View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="?android:attr/colorControlNormal"
android:pathData="M2,2H11V11H2V2M17.5,2C20,2 22,4 22,6.5C22,9 20,11 17.5,11C15,11 13,9 13,6.5C13,4 15,2 17.5,2M6.5,14L11,22H2L6.5,14M19,17H22V19H19V22H17V19H14V17H17V14H19V17Z" />
</vector>

View File

@@ -3,5 +3,5 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000" android:pathData="M15,6V8H3V6H15M15,10V12H3V10H15M3,16V14H11V16H3M17,6H22V8H19V17A3,3 0 0,1 16,20A3,3 0 0,1 13,17A3,3 0 0,1 16,14C16.35,14 16.69,14.07 17,14.18V6M16,16A1,1 0 0,0 15,17A1,1 0 0,0 16,18A1,1 0 0,0 17,17A1,1 0 0,0 16,16Z" />
<path android:fillColor="?android:attr/colorControlNormal" android:pathData="M15,6V8H3V6H15M15,10V12H3V10H15M3,16V14H11V16H3M17,6H22V8H19V17A3,3 0 0,1 16,20A3,3 0 0,1 13,17A3,3 0 0,1 16,14C16.35,14 16.69,14.07 17,14.18V6M16,16A1,1 0 0,0 15,17A1,1 0 0,0 16,18A1,1 0 0,0 17,17A1,1 0 0,0 16,16Z" />
</vector>

View File

@@ -25,7 +25,7 @@
<ListPreference
android:key="theme_switch"
android:icon="@drawable/ic_system_theme"
android:icon="@drawable/ic_system_theme"
android:title="@string/theme_type_title"
android:summary="%s"
android:dialogTitle="@string/theme_type_summary"
@@ -40,6 +40,14 @@
android:persistent="false"
android:entries="@array/switch_style_entries"
android:entryValues="@array/switch_style_values" />
<ListPreference
android:key="qs_tile_style"
android:icon="@drawable/ic_shape2_icon"
android:title="@string/qs_tile_style_title"
android:persistent="false"
android:entries="@array/qs_selector_entries"
android:entryValues="@array/qs_selector_values" />
<com.cherish.settings.preferences.SystemSettingIntListPreference
android:key="theming_settings_dashboard_icons"

View File

@@ -49,6 +49,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
private static final String SYSUI_STATUS_BAR_PADDING = "sysui_status_bar_padding";
private static final String SYSUI_ROUNDED_FWVALS = "sysui_rounded_fwvals";
private static final String SWITCH_STYLE = "switch_style";
private static final String QS_TILE_STYLE = "qs_tile_style";
private UiModeManager mUiModeManager;
private IOverlayManager mOverlayService;
@@ -58,6 +59,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
private CustomSeekBarPreference mSBPadding;
private SwitchPreference mRoundedFwvals;
private ListPreference mSwitchStyle;
private ListPreference mQsTileStyle;
@Override
public void onCreate(Bundle icicle) {
@@ -118,6 +120,15 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
mSwitchStyle.setSummary(mSwitchStyle.getEntry());
mSwitchStyle.setOnPreferenceChangeListener(this);
mQsTileStyle = (ListPreference) findPreference(QS_TILE_STYLE);
int qsTileStyle = Settings.System.getIntForUser(resolver,
Settings.System.QS_TILE_STYLE, 0, UserHandle.USER_CURRENT);
int valueIndex = mQsTileStyle.findIndexOfValue(String.valueOf(qsTileStyle));
mQsTileStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
mQsTileStyle.setSummary(mQsTileStyle.getEntry());
mQsTileStyle.setOnPreferenceChangeListener(this);
mOverlayService = IOverlayManager.Stub
.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
mUiModeManager = getContext().getSystemService(UiModeManager.class);
@@ -235,6 +246,11 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
Settings.System.putInt(resolver, Settings.System.SWITCH_STYLE, Integer.valueOf(value));
int valueIndex = mSwitchStyle.findIndexOfValue(value);
mSwitchStyle.setSummary(mSwitchStyle.getEntries()[valueIndex]);
} else if (preference == mQsTileStyle) {
int qsTileStyleValue = Integer.valueOf((String) objValue);
Settings.System.putIntForUser(resolver,
Settings.System.QS_TILE_STYLE, qsTileStyleValue, UserHandle.USER_CURRENT);
mQsTileStyle.setSummary(mQsTileStyle.getEntries()[qsTileStyleValue]);
}
return true;
}
@@ -304,4 +320,4 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
}
}
}