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

[SQUASH] Cherish: Refactor how we display the VoLTE/VoWiFi icons [2/2]

Browse Source 
Includes from the following commits:

* Add option to select VoLTE icon: b913ca190c.
* Add more VoWiFi icon styles: 3f0891b04f.
* Override VoLTE icon with VoWiFi when available: ab4fdc2bed.
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
Pranav Vashi
2021-12-23 18:55:01 +09:00
committed by Hưng Phan
parent 4c12eb7d1b
commit af3b8cff85
3 changed files with 18 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
res/values/cherish_arrays.xml
View File

@@ -191,27 +191,6 @@
<item>2</item>
</string-array>
<!-- VoLTE Icon Type -->
<string-array name="volte_icon_type_entries" translatable="false">
<item>@string/volte_icon_volte</item>
<item>@string/volte_icon_oos</item>
<item>@string/volte_icon_hd</item>
<item>@string/volte_icon_asus</item>
<item>@string/volte_icon_hd2</item>
<item>@string/volte_icon_miui</item>
<item>@string/volte_icon_emui</item>
</string-array>
<string-array name="volte_icon_type_values" translatable="false">
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
</string-array>
<!-- Battery bar -->
<string-array name="battery_bar_no_navbar_entries">
<item>@string/battery_bar_location_hide</item>
@@ -351,46 +330,6 @@
<item>3</item>
<item>4</item>
</string-array>
<!-- VoWiFi Icon -->
<string-array name="vowifi_icon_entries" translatable="false">
<item>@string/vowifi_icon_disabled</item>
<item>@string/vowifi_icon_enabled</item>
<item>@string/vowifi_icon_enabled_volte_disabled</item>
</string-array>
<string-array name="vowifi_icon_values" translatable="false">
<item>0</item>
<item>1</item>
<item>2</item>
</string-array>
<!-- VoWiFi icon style -->
<string-array name="vowifi_icon_style_entries" translatable="false">
<item>@string/vowifi_icon_default</item>
<item>@string/vowifi_icon_oneplus</item>
<item>@string/vowifi_icon_moto</item>
<item>@string/vowifi_icon_asus</item>
<item>@string/vowifi_icon_emui</item>
<item>@string/vowifi_icon_simple1</item>
<item>@string/vowifi_icon_simple2</item>
<item>@string/vowifi_icon_simple3</item>
<item>@string/vowifi_icon_vivo</item>
<item>@string/vowifi_icon_margaritov</item>
</string-array>
<string-array name="vowifi_icon_style_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>
</string-array>
<!-- AOD Schedule -->
<string-array name="doze_always_on_auto_mode_entries">

30
res/values/cherish_strings.xml
View File

@@ -203,20 +203,9 @@
<string name="show_fourg_icon_title">4G icon</string>
<string name="show_fourg_icon_summary">Display 4G icon in signal icon instead LTE</string>
<!-- Show VoLTE icon on statusbar -->
<string name="volte_switch_title">VoLTE icon</string>
<string name="volte_switch_summary">Display VoLTE icon</string>
<!-- VoLTE icon -->
<string name="volte_icon_title">VoLTE icon</string>
<string name="volte_icon_summary">Display VoLTE icon</string>
<string name="volte_icon_style_title">Select VoLTE Icon</string>
<string name="volte_icon_asus">VoLTE Asus Icon</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_hd2">HD CAF Icon</string>
<string name="volte_icon_miui">MIUI 11</string>
<string name="volte_icon_emui">EMUI</string>
<string name="volte_icon_summary">Display VoLTE icon when available</string>
<!-- Volume swap buttons -->
<string name="swap_volume_buttons_title">Reorient</string>
@@ -552,20 +541,7 @@
<!-- VoWiFi icon -->
<string name="vowifi_icon_title">VoWiFi icon</string>
<string name="vowifi_icon_enabled">VoWiFi icon enabled</string>
<string name="vowifi_icon_disabled">VoWiFi icon disabled</string>
<string name="vowifi_icon_enabled_volte_disabled">Display VoWiFi instead of VoLTE</string>
<string name="vowifi_icon_style_title">Select VoWiFi icon</string>
<string name="vowifi_icon_default">Default</string>
<string name="vowifi_icon_emui">EMUI</string>
<string name="vowifi_icon_asus">Asus</string>
<string name="vowifi_icon_oneplus">OOS</string>
<string name="vowifi_icon_moto">Motorola</string>
<string name="vowifi_icon_simple1">Simple 1</string>
<string name="vowifi_icon_simple2">Simple 2</string>
<string name="vowifi_icon_simple3">Simple 3</string>
<string name="vowifi_icon_vivo">Vivo</string>
<string name="vowifi_icon_margaritov">Margaritov</string>
<string name="vowifi_icon_summary">Display VoWiFi icon when available</string>
<!-- Lockscreen media artwork -->
<string name="lockscreen_media_blur_title">Media art blur level</string>

44
res/xml/cherish_settings_statusbar.xml
View File

@@ -57,37 +57,23 @@
android:summary="@string/show_fourg_icon_summary"
android:defaultValue="false"/>
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="show_volte_icon"
android:title="@string/volte_icon_title"
android:summary="@string/volte_icon_summary"
android:defaultValue="true"/>
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="volte_icon_style"
android:icon="@drawable/ic_volte"
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="0"
android:dependency="show_volte_icon" />
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="volte_icon_style"
android:title="@string/volte_icon_title"
android:summary="@string/volte_icon_summary"
android:defaultValue="0"
android:max="9"
settings:min="0"
settings:units="" />
<com.cherish.settings.preferences.SystemSettingListPreference
android:key="vowifi_icon"
android:title="@string/vowifi_icon_title"
android:entries="@array/vowifi_icon_entries"
android:entryValues="@array/vowifi_icon_values"
android:summary="%s"
android:defaultValue="0"/>
<com.cherish.settings.preferences.SystemSettingListPreference
<com.cherish.settings.preferences.SystemSettingSeekBarPreference
android:key="vowifi_icon_style"
android:title="@string/vowifi_icon_style_title"
android:entries="@array/vowifi_icon_style_entries"
android:entryValues="@array/vowifi_icon_style_values"
android:summary="%s"
android:defaultValue="0"/>
android:title="@string/vowifi_icon_title"
android:summary="@string/vowifi_icon_summary"
android:defaultValue="0"
android:max="11"
settings:min="0"
settings:units="" />
<com.cherish.settings.preferences.SystemSettingSwitchPreference
android:key="roaming_indicator_icon"