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

[SQUASHED] SystemUI: user selectable VoLTE/VoWifi Icons [2/2]

Browse Source 
This reverts commit dc7f7b2ee5.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
SuperDroidBond
2023-03-31 02:14:39 +07:00
committed by Hưng Phan
parent af75404f90
commit f0f3eaa93f
4 changed files with 165 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
res/values/cherish_arrays.xml
View File

@@ -45,6 +45,84 @@
<item>4</item>
</string-array>
<!-- VoLTE Icon Type -->
<string-array name="volte_icon_type_entries" translatable="false">
<item>@string/volte_icon_off</item>
<item>@string/volte_icon_dynamic</item>
<item>@string/volte_icon_vo</item>
<item>@string/volte_icon_volte</item>
<item>@string/volte_icon_oos</item>
<item>@string/volte_icon_hd</item>
<item>@string/volte_icon_miui</item>
<item>@string/volte_icon_emui</item>
<item>@string/volte_icon_margaritov2</item>
<item>@string/volte_icon_margaritov</item>
<item>@string/volte_icon_vivo</item>
<item>@string/volte_icon_aris</item>
<item>@string/volte_icon_beast</item>
<item>@string/volte_icon_ios</item>
<item>@string/volte_icon_lr</item>
<item>@string/volte_icon_realme</item>
<item>@string/volte_icon_typeA</item>
<item>@string/volte_icon_typeB</item>
<item>@string/volte_icon_typeC</item>
<item>@string/volte_icon_typeD</item>
<item>@string/volte_icon_typeE</item>
<item>@string/volte_icon_vcircle</item>
<item>@string/volte_icon_vimeo</item>
<item>@string/volte_icon_volit</item>
<item>@string/volte_icon_zirco</item>
</string-array>
<string-array name="volte_icon_type_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
<item>10</item>
<item>11</item>
<item>12</item>
<item>13</item>
<item>14</item>
<item>15</item>
<item>16</item>
<item>17</item>
<item>18</item>
<item>19</item>
<item>20</item>
<item>21</item>
<item>22</item>
<item>23</item>
<item>24</item>
<item>25</item>
<item>26</item>
</string-array>
<!-- VoWiFi Icon Type -->
<string-array name="vowifi_icon_type_entries" translatable="false">
<item>@string/vowifi_icon_off</item>
<item>@string/vowifi_icon_dynamic</item>
<item>@string/vowifi_icon_asus</item>
<item>@string/vowifi_icon_oneplus</item>
<item>@string/vowifi_icon_moto</item>
<item>@string/vowifi_icon_emui</item>
</string-array>
<string-array name="vowifi_icon_type_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
</string-array>
<!-- Battery -->
<string-array name="status_bar_battery_percent_entries" translatable="false">
<item>@string/status_bar_battery_percentage_default</item>

38
res/values/cherish_strings.xml
View File

@@ -254,6 +254,44 @@
<string name="lockscreen_albumart_filter_grayblur">Grayscale and blurred</string>
<string name="lockscreen_albumart_filter_blur_radius_title">Blur amount for lockscreen media artwork</string>
<!-- Show VoLTE icon on statusbar -->
<string name="volte_icon_style_title">Select VoLTE/HD Icon</string>
<string name="volte_icon_off">Off</string>
<string name="volte_icon_dynamic">Dynamic VOLTE Icons</string>
<string name="volte_icon_vo">Vo Only Icon</string>
<string name="volte_icon_volte">VoLTE Icon</string>
<string name="volte_icon_oos">VoLTE OOS Icon</string>
<string name="volte_icon_hd">HD Icon</string>
<string name="volte_icon_miui">MIUI 11 Icon</string>
<string name="volte_icon_emui">EMUI Icon</string>
<string name="volte_icon_margaritov">HD Filled Icon</string>
<string name="volte_icon_margaritov2">Margaritov VoLTE Icon</string>
<string name="volte_icon_vivo">Vivo Icon</string>
<string name="volte_icon_aris">Aris Icon</string>
<string name="volte_icon_beast">Aww Icon</string>
<string name="volte_icon_ios">Ios Icon</string>
<string name="volte_icon_lr">Livenge Icon</string>
<string name="volte_icon_realme">Realme Icon</string>
<string name="volte_icon_typeA">Mild Icon</string>
<string name="volte_icon_typeB">Filth Icon</string>
<string name="volte_icon_typeC">Mue Icon</string>
<string name="volte_icon_typeD">Sus Icon</string>
<string name="volte_icon_typeE">Acherus Icon</string>
<string name="volte_icon_vcircle">Circle Icon</string>
<string name="volte_icon_vimeo">Vimeo Icon</string>
<string name="volte_icon_volit">Volit Icon</string>
<string name="volte_icon_zirco">Ziroc Icon</string>
<!-- VoWiFi icon -->
<string name="vowifi_icon_title">VoWiFi Icon</string>
<string name="vowifi_icon_summary">Display VoWiFi icon when available</string>
<string name="vowifi_icon_off">Off</string>
<string name="vowifi_icon_dynamic">Dynamic VoWiFi Icon</string>
<string name="vowifi_icon_asus">Asus VoWiFi Icon</string>
<string name="vowifi_icon_oneplus">OnePlus VoWiFi Icon</string>
<string name="vowifi_icon_moto">Moto VoWiFi Icons</string>
<string name="vowifi_icon_emui">EMUI Icons</string>
<!-- Statusbar Battery -->
<string name="battery_style_title">Battery icon style</string>
<string name="battery_style_summary">Customize battery icons, hide or show percentage</string>

16
res/xml/cherish_settings_statusbar.xml
View File

@@ -78,6 +78,22 @@
android:summary="@string/data_disabled_icon_summary"
android:defaultValue="true" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="volte_icon_style"
android:title="@string/volte_icon_style_title"
android:entries="@array/volte_icon_type_entries"
android:entryValues="@array/volte_icon_type_values"
android:summary="%s"
android:defaultValue="1"/>
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="vowifi_icon_style"
android:title="@string/vowifi_icon_title"
android:entries="@array/vowifi_icon_type_entries"
android:entryValues="@array/vowifi_icon_type_values"
android:summary="%s"
android:defaultValue="1"/>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="use_old_mobiletype"
android:title="@string/use_old_mobiletype_title"

35
src/com/cherish/settings/fragments/StatusBarSettings.java
View File

@@ -46,7 +46,14 @@ import java.util.Collections;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class StatusBarSettings extends SettingsPreferenceFragment implements
OnPreferenceChangeListener {
Preference.OnPreferenceChangeListener {
private static final String VOLTE_ICON_STYLE = "volte_icon_style";
private static final String VOWIFI_ICON_STYLE = "vowifi_icon_style";
private SystemSettingListPreference mVolteIconStyle;
private SystemSettingListPreference mVowifiIconStyle;
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -56,11 +63,35 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
ContentResolver resolver = getActivity().getContentResolver();
PreferenceScreen prefSet = getPreferenceScreen();
mVowifiIconStyle = (SystemSettingListPreference) findPreference(VOWIFI_ICON_STYLE);
mVolteIconStyle = (SystemSettingListPreference) findPreference(VOLTE_ICON_STYLE);
int vowifiIconStyle = Settings.System.getInt(getActivity().getContentResolver(),
Settings.System.VOWIFI_ICON_STYLE, 1);
mVowifiIconStyle.setValue(String.valueOf(vowifiIconStyle));
mVowifiIconStyle.setOnPreferenceChangeListener(this);
if (vowifiIconStyle == 0) {
mVolteIconStyle.setEnabled(true);
} else {
mVolteIconStyle.setEnabled(false);
}
}
@Override
public boolean onPreferenceChange(Preference preference, Object objValue) {
public boolean onPreferenceChange(Preference preference, Object newValue) {
ContentResolver resolver = getActivity().getContentResolver();
if (preference == mVowifiIconStyle) {
int vowifiIconStyle = Integer.parseInt(((String) newValue).toString());
Settings.System.putInt(resolver,
Settings.System.VOWIFI_ICON_STYLE, vowifiIconStyle);
mVowifiIconStyle.setValue(String.valueOf(vowifiIconStyle));
if (vowifiIconStyle == 0) {
mVolteIconStyle.setEnabled(true);
} else {
mVolteIconStyle.setEnabled(false);
}
return true;
}
return false;
}