psmattas/android_packages_apps_Cherish
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cherish: Add DU themes [3/3]

Browse Source 
SDB: Adapt for AOSP Settings

Special Thanks to @imjyotiraditya for the help
This commit is contained in:
Mazda--
2020-01-20 10:27:44 +07:00
committed by Hung Phan
parent 2ac26d42c5
commit 362adb0b25
8 changed files with 206 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/drawable/ic_settings_themes.xml Normal file
View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path android:fillColor="#000000"
android:pathData="M19,19L12,11V19H5L12,11V5H19M19,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3Z"/>
</vector>

9
res/drawable/ic_system_theme.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:fillColor="?android:attr/colorControlNormal"
android:pathData="M443.5,234.5c0,-91.6 -74.5,-166 -166,-166h-42.9c-91.6,0 -166,74.5 -166,166v40.2h56.2v112.5c0,31 25.2,56.3 56.3,56.3h150c31,0 56.3,-25.2 56.3,-56.3V274.8h56.3V234.5zM349.8,387.3c0,10.3 -8.4,18.8 -18.8,18.8H181c-10.3,0 -18.8,-8.4 -18.8,-18.8V218.5h37.5v75h37.5v-75h37.5V256h37.5v-37.5h37.5V387.3zM406,237.3h-18.8V181H124.8v56.3H106v-2.7c0,-70.9 57.7,-128.5 128.5,-128.5h42.9c70.9,0 128.5,57.7 128.5,128.5V237.3z" />
</vector>

9
res/values-vi/cherish_strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2016 The Nitrogen OS
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
<string name="recents_title">Ứng dụng gần đây</string>
<string name="statusbar_title">Thanh trạng thái</string>
<string name="volume_title">Phím Âm lượng</string>
<string name="theme_title">Chủ đề</string>
<string name="notifications_title">Thông báo</string>
<string name="device_part_title">Tính năng thiết bị</string>
<string name="qs_category">Kiểu Qs</string>
@@ -229,4 +230,10 @@
<!-- Old MobileType Toggle -->
<string name="use_old_mobiletype_title">Sử dụng kiểu di động cũ</string>
<string name="use_old_mobiletype_summary">Hợp nhất các tín hiệu và loại biểu tượng</string>
<!-- Themes -->
<string name="theme_type_title">Chủ đề hệ thống</string>
<string name="theme_type_summary">Lựa chọn chủ đê</string>
<string name="theme_type_light">Sáng</string>
<string name="theme_type_pitch_black">Google dark</string>
<string name="theme_type_solarized_dark">Solarized dark</string>
</resources>

13
res/values/cherish_arrays.xml
View File

@@ -264,4 +264,17 @@
<item>4</item>
<item>5</item>
</string-array>
<!-- Themes -->
<string-array name="theme_type_titles">
<item>@string/theme_type_light</item>
<item>@string/theme_type_pitch_black</item>
<item>@string/theme_type_solarized_dark</item>
</string-array>
<string-array name="theme_type_values">
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
</resources>

8
res/values/cherish_strings.xml
View File

@@ -21,6 +21,7 @@
<string name="misc_title">Miscellaneous</string>
<string name="navbar_title">Navigation bar</string>
<string name="powermenu_title">Power menu</string>
<string name="theme_title">Themes</string>
<string name="quicksettings_title">Quick Settings</string>
<string name="recents_title">Recents apps</string>
<string name="statusbar_title">Status bar</string>
@@ -259,5 +260,12 @@
<!-- Old MobileType Toggle -->
<string name="use_old_mobiletype_title">Use old mobile type style</string>
<string name="use_old_mobiletype_summary">Merge signal and type icons</string>
<!-- Themes -->
<string name="theme_type_title">System theme</string>
<string name="theme_type_summary">Select theme</string>
<string name="theme_type_light">Light</string>
<string name="theme_type_pitch_black">Google dark</string>
<string name="theme_type_solarized_dark">Solarized dark</string>
</resources>

7
res/xml/cherish_settings.xml
View File

@@ -30,6 +30,13 @@
android:title="@string/quicksettings_title"
android:fragment="com.cherish.settings.fragments.QuickSettings"
android:icon="@drawable/ic_settings_quicksettings"/>
<!-- Themes -->
<Preference
android:key="theme_category"
android:title="@string/theme_title"
android:fragment="com.cherish.settings.fragments.ThemeSettings"
android:icon="@drawable/ic_settings_themes"/>
<!-- Buttons -->
<Preference

37
res/xml/cherish_settings_theme.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2020 CherishOS
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/theme_title"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<PreferenceCategory
android:key="system_theme_category"
android:title="@string/theme_type_title">
<ListPreference
android:key="theme_switch"
android:icon="@drawable/ic_system_theme"
android:title="@string/theme_type_title"
android:summary="@string/theme_type_summary"
android:dialogTitle="@string/theme_type_summary"
android:entries="@array/theme_type_titles"
android:entryValues="@array/theme_type_values"
android:defaultValue="1"/>
</PreferenceCategory>
</PreferenceScreen>

114
src/com/cherish/settings/fragments/ThemeSettings.java Normal file
View File

@@ -0,0 +1,114 @@
package com.cherish.settings.fragments;
import com.android.internal.logging.nano.MetricsProto;
import static android.os.UserHandle.USER_SYSTEM;
import android.app.UiModeManager;
import android.os.Bundle;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import android.content.ContentResolver;
import android.content.res.Resources;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceManager;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
import com.cherish.settings.preferences.CustomSeekBarPreference;
import android.provider.Settings;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.Locale;
import android.text.TextUtils;
import android.view.View;
import java.util.List;
import java.util.ArrayList;
import java.util.Objects;
import com.android.internal.util.cherish.ThemesUtils;
import com.android.internal.util.cherish.Utils;
public class ThemeSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener {
private static final String PREF_THEME_SWITCH = "theme_switch";
private UiModeManager mUiModeManager;
private ListPreference mThemeSwitch;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.cherish_settings_theme);
PreferenceScreen prefScreen = getPreferenceScreen();
ContentResolver resolver = getActivity().getContentResolver();
mUiModeManager = getContext().getSystemService(UiModeManager.class);
setupThemeSwitchPref();
}
@Override
public boolean onPreferenceChange(Preference preference, Object objValue) {
if (preference == mThemeSwitch) {
String theme_switch = (String) objValue;
final Context context = getContext();
switch (theme_switch) {
case "1":
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_NO, ThemesUtils.SOLARIZED_DARK);
break;
case "2":
handleBackgrounds(false, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
break;
case "3":
handleBackgrounds(true, context, UiModeManager.MODE_NIGHT_YES, ThemesUtils.SOLARIZED_DARK);
break;
}
try {
mOverlayService.reloadAndroidAssets(UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.settings", UserHandle.USER_CURRENT);
mOverlayService.reloadAssets("com.android.systemui", UserHandle.USER_CURRENT);
} catch (RemoteException ignored) {
}
}
return true;
}
private void setupThemeSwitchPref() {
mThemeSwitch = (ListPreference) findPreference(PREF_THEME_SWITCH);
mThemeSwitch.setOnPreferenceChangeListener(this);
if (Utils.isThemeEnabled("com.android.theme.solarizeddark.system")) {
mThemeSwitch.setValue("3");
} else if (mUiModeManager.getNightMode() == UiModeManager.MODE_NIGHT_YES) {
mThemeSwitch.setValue("2");
} else {
mThemeSwitch.setValue("1");
}
}
private void handleBackgrounds(Boolean state, Context context, int mode, String[] overlays) {
if (context != null) {
Objects.requireNonNull(context.getSystemService(UiModeManager.class))
.setNightMode(mode);
}
for (int i = 0; i < overlays.length; i++) {
String background = overlays[i];
try {
mOverlayService.setEnabled(background, state, USER_SYSTEM);
} catch (RemoteException e) {
e.printStackTrace();
}
}
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
}
}