Cherish: Add QS Panel Styles [2/3]
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -262,4 +262,18 @@
|
|||||||
<item>1</item>
|
<item>1</item>
|
||||||
<item>2</item>
|
<item>2</item>
|
||||||
</string-array>
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="qs_styles_entries" translatable="false">
|
||||||
|
<item>@string/default_string</item>
|
||||||
|
<item>@string/qs_outline</item>
|
||||||
|
<item>@string/qs_two_tone</item>
|
||||||
|
<item>@string/qs_color_pop</item>
|
||||||
|
</string-array>
|
||||||
|
|
||||||
|
<string-array name="qs_styles_values" translatable="false">
|
||||||
|
<item>0</item>
|
||||||
|
<item>1</item>
|
||||||
|
<item>2</item>
|
||||||
|
<item>3</item>
|
||||||
|
</string-array>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -550,4 +550,10 @@
|
|||||||
<string name="torch_power_button_gesture_dt_toast">Jump to camera gesture is now disabled</string>
|
<string name="torch_power_button_gesture_dt_toast">Jump to camera gesture is now disabled</string>
|
||||||
<string name="torch_power_button_gesture_lp">Long press power button</string>
|
<string name="torch_power_button_gesture_lp">Long press power button</string>
|
||||||
|
|
||||||
|
<!-- Quick settings styling -->
|
||||||
|
<string name="qs_styling">Quick Settings UI</string>
|
||||||
|
<string name="qs_styles_title">QS Panel Styles</string>
|
||||||
|
<string name="qs_outline">QS Outline Style</string>
|
||||||
|
<string name="qs_two_tone">QS Two-Tone Accent</string>
|
||||||
|
<string name="qs_color_pop">QS Color Pop</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
@@ -59,6 +59,16 @@
|
|||||||
android:summary="@string/dark_ui_mode_summary"
|
android:summary="@string/dark_ui_mode_summary"
|
||||||
android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
|
android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
|
||||||
settings:controller="com.android.settings.display.DarkUIPreferenceController" />
|
settings:controller="com.android.settings.display.DarkUIPreferenceController" />
|
||||||
|
|
||||||
|
<!-- QS style -->
|
||||||
|
<com.cherish.settings.preferences.SystemSettingListPreference
|
||||||
|
android:key="qs_panel_style"
|
||||||
|
android:title="@string/qs_styles_title"
|
||||||
|
android:dialogTitle="@string/qs_styles_title"
|
||||||
|
android:entries="@array/qs_styles_entries"
|
||||||
|
android:entryValues="@array/qs_styles_values"
|
||||||
|
android:summary="%s"
|
||||||
|
android:defaultValue="0" />
|
||||||
|
|
||||||
<!-- Font style -->
|
<!-- Font style -->
|
||||||
<Preference
|
<Preference
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.cherish.settings.fragments;
|
|||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
import static android.os.UserHandle.USER_SYSTEM;
|
import static android.os.UserHandle.USER_SYSTEM;
|
||||||
|
import static android.os.UserHandle.USER_CURRENT;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.app.Dialog;
|
import android.app.Dialog;
|
||||||
@@ -59,7 +60,9 @@ import android.provider.SearchIndexableResource;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import android.database.ContentObserver;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Handler;
|
||||||
import com.android.internal.util.cherish.CherishUtils;
|
import com.android.internal.util.cherish.CherishUtils;
|
||||||
import com.android.settings.dashboard.DashboardFragment;
|
import com.android.settings.dashboard.DashboardFragment;
|
||||||
import com.cherish.settings.preferences.SystemSettingListPreference;
|
import com.cherish.settings.preferences.SystemSettingListPreference;
|
||||||
@@ -73,13 +76,17 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
|
|||||||
private static final String SETTINGS_DASHBOARD_STYLE = "settings_dashboard_style";
|
private static final String SETTINGS_DASHBOARD_STYLE = "settings_dashboard_style";
|
||||||
private static final String USE_STOCK_LAYOUT = "use_stock_layout";
|
private static final String USE_STOCK_LAYOUT = "use_stock_layout";
|
||||||
private static final String DISABLE_USERCARD = "disable_usercard";
|
private static final String DISABLE_USERCARD = "disable_usercard";
|
||||||
|
private static final String QS_PANEL_STYLE = "qs_panel_style";
|
||||||
|
|
||||||
public static final String TAG = "ThemeSettings";
|
public static final String TAG = "ThemeSettings";
|
||||||
static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
|
static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
|
||||||
static final int DEFAULT = 0xff1a73e8;
|
static final int DEFAULT = 0xff1a73e8;
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
|
|
||||||
|
private Handler mHandler;
|
||||||
|
private IOverlayManager mOverlayManager;
|
||||||
private IOverlayManager mOverlayService;
|
private IOverlayManager mOverlayService;
|
||||||
|
private SystemSettingListPreference mQsStyle;
|
||||||
private UiModeManager mUiModeManager;
|
private UiModeManager mUiModeManager;
|
||||||
private SystemSettingListPreference mSettingsDashBoardStyle;
|
private SystemSettingListPreference mSettingsDashBoardStyle;
|
||||||
private SystemSettingSwitchPreference mAltSettingsLayout;
|
private SystemSettingSwitchPreference mAltSettingsLayout;
|
||||||
@@ -125,12 +132,41 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
|
|||||||
mUseStockLayout.setOnPreferenceChangeListener(this);
|
mUseStockLayout.setOnPreferenceChangeListener(this);
|
||||||
mDisableUserCard = (SystemSettingSwitchPreference) findPreference(DISABLE_USERCARD);
|
mDisableUserCard = (SystemSettingSwitchPreference) findPreference(DISABLE_USERCARD);
|
||||||
mDisableUserCard.setOnPreferenceChangeListener(this);
|
mDisableUserCard.setOnPreferenceChangeListener(this);
|
||||||
|
|
||||||
|
mOverlayService = IOverlayManager.Stub
|
||||||
|
.asInterface(ServiceManager.getService(Context.OVERLAY_SERVICE));
|
||||||
|
|
||||||
|
mQsStyle = (SystemSettingListPreference) findPreference(QS_PANEL_STYLE);
|
||||||
|
mCustomSettingsObserver.observe();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isAvailable() {
|
public boolean isAvailable() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private CustomSettingsObserver mCustomSettingsObserver = new CustomSettingsObserver(mHandler);
|
||||||
|
private class CustomSettingsObserver extends ContentObserver {
|
||||||
|
|
||||||
|
CustomSettingsObserver(Handler handler) {
|
||||||
|
super(handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
void observe() {
|
||||||
|
Context mContext = getContext();
|
||||||
|
ContentResolver resolver = mContext.getContentResolver();
|
||||||
|
resolver.registerContentObserver(Settings.System.getUriFor(
|
||||||
|
Settings.System.QS_PANEL_STYLE),
|
||||||
|
false, this, UserHandle.USER_ALL);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onChange(boolean selfChange, Uri uri) {
|
||||||
|
if (uri.equals(Settings.System.getUriFor(Settings.System.QS_PANEL_STYLE))) {
|
||||||
|
updateQsStyle();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onPreferenceChange(Preference preference, Object objValue) {
|
public boolean onPreferenceChange(Preference preference, Object objValue) {
|
||||||
ContentResolver resolver = getActivity().getContentResolver();
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
@@ -145,10 +181,60 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
|
|||||||
return true;
|
return true;
|
||||||
} else if (preference == mDisableUserCard) {
|
} else if (preference == mDisableUserCard) {
|
||||||
CherishUtils.showSettingsRestartDialog(getContext());
|
CherishUtils.showSettingsRestartDialog(getContext());
|
||||||
|
return true;
|
||||||
|
} else if (preference == mQsStyle) {
|
||||||
|
mCustomSettingsObserver.observe();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void updateQsStyle() {
|
||||||
|
ContentResolver resolver = getActivity().getContentResolver();
|
||||||
|
|
||||||
|
int qsPanelStyle = Settings.System.getIntForUser(getContext().getContentResolver(),
|
||||||
|
Settings.System.QS_PANEL_STYLE , 0, UserHandle.USER_CURRENT);
|
||||||
|
|
||||||
|
if (qsPanelStyle == 0) {
|
||||||
|
setDefaultStyle(mOverlayService);
|
||||||
|
} else if (qsPanelStyle == 1) {
|
||||||
|
setQsStyle(mOverlayService, "com.android.system.qs.outline");
|
||||||
|
} else if (qsPanelStyle == 2 || qsPanelStyle == 3) {
|
||||||
|
setQsStyle(mOverlayService, "com.android.system.qs.twotoneaccent");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setDefaultStyle(IOverlayManager overlayManager) {
|
||||||
|
for (int i = 0; i < QS_STYLES.length; i++) {
|
||||||
|
String qsStyles = QS_STYLES[i];
|
||||||
|
try {
|
||||||
|
overlayManager.setEnabled(qsStyles, false, USER_SYSTEM);
|
||||||
|
} catch (RemoteException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setQsStyle(IOverlayManager overlayManager, String overlayName) {
|
||||||
|
try {
|
||||||
|
for (int i = 0; i < QS_STYLES.length; i++) {
|
||||||
|
String qsStyles = QS_STYLES[i];
|
||||||
|
try {
|
||||||
|
overlayManager.setEnabled(qsStyles, false, USER_SYSTEM);
|
||||||
|
} catch (RemoteException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
overlayManager.setEnabled(overlayName, true, USER_SYSTEM);
|
||||||
|
} catch (RemoteException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static final String[] QS_STYLES = {
|
||||||
|
"com.android.system.qs.outline",
|
||||||
|
"com.android.system.qs.twotoneaccent"
|
||||||
|
};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMetricsCategory() {
|
public int getMetricsCategory() {
|
||||||
|
|||||||
Reference in New Issue
Block a user