Cherish:User toggle for unlimited photos storage [2/2]

User toggle for StreamProp [2/2]
User toggle for GamesProp [2/2]

Co-authored-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

res/values/cherish_arrays.xml

@@ -87,6 +87,20 @@
         <item>@string/volte_icon_oos</item>
         <item>@string/volte_icon_volte</item>
         <item>@string/volte_icon_vo</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">
@@ -101,6 +115,20 @@
         <item>2</item>
         <item>1</item>
         <item>0</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>
     </string-array>
 
     <!-- VoWiFi Icon -->
@@ -320,6 +348,17 @@
         <item>@string/status_bar_battery_style_dotted_circle</item>
         <item>@string/status_bar_battery_style_filled_circle</item>
         <item>@string/status_bar_battery_style_text</item>
+        <item>@string/status_bar_battery_style_icon_rlandscape</item>
+        <item>@string/status_bar_battery_style_icon_landscape</item>
+        <item>@string/status_bar_battery_style_icon_landscape_buddy</item>
+        <item>@string/status_bar_battery_style_icon_landscape_line</item>
+        <item>@string/status_bar_battery_style_icon_landscape_musku</item>
+        <item>@string/status_bar_battery_style_icon_landscape_pill</item>
+        <item>@string/status_bar_battery_style_icon_landscape_signal</item>
+        <item>@string/status_bar_battery_style_icon_rlandscape_style_a</item>
+        <item>@string/status_bar_battery_style_icon_landscape_style_a</item>
+        <item>@string/status_bar_battery_style_icon_rlandscape_style_b</item>
+        <item>@string/status_bar_battery_style_icon_landscape_style_b</item>
     </string-array>
 
     <string-array name="values_status_bar_battery" translatable="false">
@@ -328,6 +367,17 @@
         <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>
     </string-array>
 	
 	<!-- Network Traffic -->
@@ -521,23 +571,6 @@
         <item>@string/status_bar_date_format_custom</item>
     </string-array>
 	
-	<!-- Settings dashboard styles-->
-    <string-array name="settings_dashboard_style_entries" translatable="false">
-        <item>@string/settings_dashboard_style_aosp</item>
-        <item>@string/settings_dashboard_style_oos11_gms</item>
-        <item>@string/settings_dashboard_style_oos11_microg</item>
-        <item>@string/settings_dashboard_style_oos12_gms</item>
-        <item>@string/settings_dashboard_style_oos12_microg</item>
-    </string-array>
-
-    <string-array name="settings_dashboard_style_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-        <item>4</item>
-    </string-array>
-	
 	<!-- Lockscreen album art filter -->
     <string-array name="lockscreen_albumart_filter_entries">
         <item>@string/lockscreen_albumart_filter_none</item>
@@ -600,5 +633,57 @@
         <item>0</item>
         <item>1</item>
     </string-array>
+	
+	<!-- Settings dashboard styles-->
+    <string-array name="settings_dashboard_style_entries" translatable="false">
+        <item>@string/settings_dashboard_style_aosp</item>
+        <item>@string/settings_dashboard_style_oos11</item>
+        <item>@string/settings_dashboard_style_oos12</item>
+        <item>@string/settings_dashboard_style_cherish</item>
+        <item>@string/settings_dashboard_style_cherish_clean</item>
+    </string-array>
+
+    <string-array name="settings_dashboard_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+	
+	<!-- QS SystemInfo -->
+    <string-array name="qs_system_info_entries">
+        <item>@string/qs_system_info_off</item>
+        <item>@string/qs_system_info_cpu_temp</item>
+        <item>@string/qs_system_info_battery_temp</item>
+        <item>@string/qs_system_info_gpu_clock</item>
+        <item>@string/qs_system_info_gpu_busy</item>
+    </string-array>
+    <string-array name="qs_system_info_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </string-array>
+	
+	<!-- QS Header data uasge -->
+    <string-array name="qs_datausage_entries" translatable="false">
+        <item>@string/qs_datausage_disabled</item>
+        <item>@string/qs_datausage_daily</item>
+        <item>@string/qs_datausage_monthly</item>
+    </string-array>
+    <string-array name="qs_datausage_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="qs_system_info_checks">
+        <item>android:string/config_sysCPUTemp</item>
+        <item>android:string/config_sysBatteryTemp</item>
+        <item>android:string/config_sysGPUFreq</item>
+        <item>android:string/config_sysGPULoad</item>
+    </string-array>
 
 </resources>

res/values/cherish_maintainers.xml

@@ -71,7 +71,7 @@
    <string name="device_picasso">Xiaomi Redmi K30 5G</string>
    <string name="picasso_maintainer">Dinh San</string>
    <string name="device_laurel_sprout">Xiaomi Mi A3</string>
-   <string name="laurel_sprout_maintainer">AbStRaCt_IrIs</string>
+   <string name="laurel_sprout_maintainer">RAYAN(BASUBHAJANTRI)</string>
    <string name="device_davinci">Xiaomi Mi 9T/K20</string>
    <string name="davinci_maintainer">Luis Gonzales</string>
    <string name="device_raphael">Xiaomi Mi 9T Pro/K20 Pro</string>

res/values/cherish_strings.xml

@@ -300,6 +300,20 @@
     <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>
@@ -527,6 +541,17 @@
     <string name="status_bar_battery_style_dotted_circle">Circle (Dotted)</string>
     <string name="status_bar_battery_style_filled_circle">Circle (Filled)</string>
     <string name="status_bar_battery_style_text">Text</string>
+    <string name="status_bar_battery_style_icon_rlandscape">Icon landscape (Right)</string>
+    <string name="status_bar_battery_style_icon_landscape">Icon landscape (Left)</string>
+    <string name="status_bar_battery_style_icon_rlandscape_style_a">Landscape R Style A</string>
+    <string name="status_bar_battery_style_icon_landscape_style_a">Landscape L Style A</string>
+    <string name="status_bar_battery_style_icon_rlandscape_style_b">Landscape R Style B</string>
+    <string name="status_bar_battery_style_icon_landscape_style_b">Landscape L Style B</string>
+    <string name="status_bar_battery_style_icon_landscape_pill">Portrait Mx</string>
+    <string name="status_bar_battery_style_icon_landscape_line">Landscape Lorn</string>
+    <string name="status_bar_battery_style_icon_landscape_musku">Portrait IOS</string>
+    <string name="status_bar_battery_style_icon_landscape_signal">Landscape Airoo</string>
+    <string name="status_bar_battery_style_icon_landscape_buddy">Landscape Capsule</string>
 	
 	<!-- Network Traffic -->
     <string name="traffic_title">Traffic indicators</string>
@@ -642,15 +667,6 @@
     <!-- QS date -->
     <string name="qs_date_title">Date</string>
     <string name="qs_date_summary">Display date in quick status bar header</string>
-	
-	<!-- Custom settings dashboard style -->
-    <string name="settings_dashboard_style_title">Settings layout</string>
-    <string name="settings_dashboard_style_aosp">AOSP</string>
-    <string name="settings_dashboard_style_oos11_gms">OOS11 Gapps</string>
-    <string name="settings_dashboard_style_oos11_microg">OOS11 MicroG</string>
-    <string name="settings_dashboard_style_oos12_gms">OOS12 Gapps</string>
-    <string name="settings_dashboard_style_oos12_microg">OOS12 MicroG</string>
-    <string name="settings_layout_category_title">Settings UI interface</string>
 
 	<!-- Media art -->
     <string name="lockscreen_media_category">Lock screen media</string>
@@ -792,4 +808,52 @@
 	<!-- Colorful battery icon -->
     <string name="battery_level_colors_title">Toggle colorful battery icon</string>
     <string name="battery_level_colors_summary">Each battery level drop is color coded</string>
+	
+	<!-- Qs Transparency -->
+    <string name="qs_transparency_summary">Choose how transparent you want your qs to be (Requires SystemUI)</string>
+    <string name="qs_transparency_title">Qs Transparency</string>
+	
+	<!-- Custom settings dashboard style -->
+    <string name="settings_dashboard_style_title">Settings layout</string>
+    <string name="settings_dashboard_style_aosp">Aosp</string>
+    <string name="settings_dashboard_style_oos11">OxygenOS 11</string>
+    <string name="settings_dashboard_style_oos12">OxygenOS 12</string>
+    <string name="settings_dashboard_style_cherish">Cherish</string>
+    <string name="settings_dashboard_style_cherish_clean">Cherish Clean</string>
+    <string name="settings_layout_category_title">Settings UI interface</string>
+    <string name="settings_base_style_title">Settings Base layout</string>
+    <string name="settings_base_style_summary">Use an alternative layout for setting menus</string>
+    <string name="settings_home_style_title">Settings Home layout</string>
+    <string name="settings_home_style_summary">Use stock aosp layout for homepage</string>
+    <string name="disable_usercard_title">Settings UserCard</string>
+    <string name="disable_usercard_summary">Toggle in order not to show the usercard on main settings page</string>
+	
+	<string name="qs_header_category_title">QS Header</string>
+	
+	<!-- QS SystemInfo -->
+    <string name="qs_system_info_title">System Info</string>
+    <string name="qs_system_info_off">Off</string>
+    <string name="qs_system_info_cpu_temp">CPU temperature</string>
+    <string name="qs_system_info_battery_temp">Battery temperature</string>
+    <string name="qs_system_info_gpu_clock">GPU frequency</string>
+    <string name="qs_system_info_gpu_busy">GPU utilization</string>
+	
+	<!-- QS DataUsage Toggle -->
+    <string name="qs_datausage_title">Data usage in QS Header</string>
+    <string name="qs_datausage_disabled">Disabled</string>
+    <string name="qs_datausage_daily">Daily usage</string>
+    <string name="qs_datausage_monthly">Monthly usage</string>
+	
+	<string name="spoof_title">Spoofing</string>
+	<!-- Unlimited g00gle ph0t0s st0rage -->
+    <string name="use_photos_spoof_title">Unlimited Photos storage</string>
+    <string name="use_photos_spoof_summary">Spoof your device as Pixel XL for Google Photos app only to provide unlimited storage for backup</string>
+
+    <!-- Unlock FPS for specific games -->
+    <string name="use_games_spoof_title">Unlock higher FPS in games</string>
+    <string name="use_games_spoof_summary">Spoof your device as a different model for specific games to unlock higher FPS</string>
+
+    <!-- Unlock higher quality streams for specific apps -->
+    <string name="use_stream_spoof_title">Unlock higher quality streams</string>
+    <string name="use_stream_spoof_summary">Spoof your device as Pixel 6 Pro to unlock higher quality streams on Amazon Prime, Disney+, Hotstar, and Netflix</string>
 </resources>

res/xml/cherish_settings_lockscreen.xml

@@ -50,7 +50,7 @@
         android:key="lockscreen_media_category"
         android:title="@string/lockscreen_media_category">
 
-        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        <com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="lockscreen_media_metadata"
             android:title="@string/media_art_title"
             android:summary="@string/media_art_summary"

res/xml/cherish_settings_misc.xml

@@ -47,5 +47,31 @@
             android:targetPackage="org.exthmui.game"
             android:targetClass="org.exthmui.game.ui.MainActivity" />
     </Preference>
+	
+	<PreferenceCategory
+        android:key="spoof_category"
+        android:title="@string/spoof_title">
+
+        <!-- Unlimited Photos storage -->
+        <SwitchPreference
+            android:key="use_photos_spoof"
+            android:title="@string/use_photos_spoof_title"
+            android:summary="@string/use_photos_spoof_summary"
+            android:defaultValue="true" />
+
+        <!-- Unlock FPS for specific games -->
+        <SwitchPreference
+            android:key="use_games_spoof"
+            android:title="@string/use_games_spoof_title"
+            android:summary="@string/use_games_spoof_summary" />
+
+        <!-- Unlock higher quality streams for specific apps -->
+        <SwitchPreference
+            android:key="use_stream_spoof"
+            android:title="@string/use_stream_spoof_title"
+            android:summary="@string/use_stream_spoof_summary"
+            android:defaultValue="true" />
+
+    </PreferenceCategory>
 		
 </PreferenceScreen>

res/xml/cherish_settings_quicksettings.xml

@@ -21,6 +21,15 @@
   <PreferenceCategory
         android:title="@string/qs_title">
 		
+	<com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="qs_transparency"
+        android:title="@string/qs_transparency_title"
+        android:summary="@string/qs_transparency_summary"
+        android:defaultValue="10"
+        settings:interval="1"
+        android:max="10"         
+        android:min="1" />
+		
 	  
 	<!-- QS date -->
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
@@ -74,6 +83,26 @@
             android:entryValues="@array/quick_pulldown_values"
             android:defaultValue="0" />
 
+    </PreferenceCategory>
+	
+	<PreferenceCategory
+        android:key="qs_header_category"
+        android:title="@string/qs_header_category_title">
+
+        <com.cherish.settings.preferences.SystemSettingIntListPreference
+            android:key="qs_system_info"
+            android:title="@string/qs_system_info_title"
+            android:entries="@array/qs_system_info_entries"
+            android:entryValues="@array/qs_system_info_values"
+            android:defaultValue="0"
+            android:summary="%s" />
+			
+		<com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="qs_datausage"
+            android:title="@string/qs_datausage_title"
+            android:entries="@array/qs_datausage_entries"
+            android:entryValues="@array/qs_datausage_values"
+            android:defaultValue="0" />
     </PreferenceCategory>
 	
 	<PreferenceCategory

res/xml/cherish_settings_theme.xml

@@ -17,26 +17,44 @@
         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
+	<PreferenceCategory
         android:key="settings_layout_category"
         android:title="@string/settings_layout_category_title">
 
     <com.cherish.settings.preferences.SystemSettingListPreference
-            android:key="settings_dashboard_gms"
+            android:key="settings_dashboard_style"
             android:title="@string/settings_dashboard_style_title"
             android:entries="@array/settings_dashboard_style_entries"
             android:entryValues="@array/settings_dashboard_style_values"
             android:summary="%s"
             android:defaultValue="0" />
 
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="alt_settings_layout"
+            android:title="@string/settings_base_style_title"
+            android:summary="@string/settings_base_style_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="use_stock_layout"
+            android:title="@string/settings_home_style_title"
+            android:summary="@string/settings_home_style_summary"
+            android:defaultValue="false" />
+
+        <com.cherish.settings.preferences.SystemSettingSwitchPreference
+            android:key="disable_usercard"
+            android:title="@string/disable_usercard_title"
+            android:summary="@string/disable_usercard_summary"
+            android:defaultValue="false" />
+
+    </PreferenceCategory>
+
     <com.cherish.settings.preferences.SecureSettingSwitchPreference
         android:key="system_black_theme"
         android:title="@string/system_black_theme_title"
         android:summary="@string/system_black_theme_summary"
         android:defaultValue="false" />
-
-    </PreferenceCategory>
 	
 	<PreferenceCategory
         android:title="@string/notification_material_dismiss_button_title">

src/com/cherish/settings/fragments/ButtonSettings.java

@@ -38,7 +38,7 @@ import android.widget.Toast;
 import com.android.settings.R;
 import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 import com.cherish.settings.preferences.SecureSettingSwitchPreference;
-import com.android.internal.cherish.hardware.LineageHardwareManager;
+import com.android.internal.custom.hardware.LineageHardwareManager;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.internal.util.cherish.CherishUtils;
 import com.android.settings.SettingsPreferenceFragment;
@@ -315,4 +315,4 @@ public class ButtonSettings extends ActionFragment implements OnPreferenceChange
                 }
     };
 
-}
+}

src/com/cherish/settings/fragments/MiscSettings.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
+import android.os.SystemProperties;
 import android.content.Context;
 import android.content.ContentResolver;
 import android.content.res.Resources;
@@ -44,11 +45,24 @@ import java.util.List;
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class MiscSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
+			
+	private static final String KEY_GAMES_SPOOF = "use_games_spoof";
+    private static final String KEY_PHOTOS_SPOOF = "use_photos_spoof";
+    private static final String KEY_STREAM_SPOOF = "use_stream_spoof";
+
+    private static final String SYS_GAMES_SPOOF = "persist.sys.pixelprops.games";
+    private static final String SYS_PHOTOS_SPOOF = "persist.sys.pixelprops.gphotos";
+    private static final String SYS_STREAM_SPOOF = "persist.sys.pixelprops.streaming";
+
+    private SwitchPreference mGamesSpoof;
+    private SwitchPreference mPhotosSpoof;
+    private SwitchPreference mStreamSpoof;
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         ContentResolver resolver = getActivity().getContentResolver();
+        PreferenceScreen prefSet = getPreferenceScreen();
 
         addPreferencesFromResource(R.xml.cherish_settings_misc);
 		
@@ -61,11 +75,36 @@ public class MiscSettings extends SettingsPreferenceFragment implements
         } catch (NameNotFoundException e) {
             e.printStackTrace();
         }
+		
+		mGamesSpoof = (SwitchPreference) findPreference(KEY_GAMES_SPOOF);
+        mGamesSpoof.setChecked(SystemProperties.getBoolean(SYS_GAMES_SPOOF, false));
+        mGamesSpoof.setOnPreferenceChangeListener(this);
+
+        mPhotosSpoof = (SwitchPreference) findPreference(KEY_PHOTOS_SPOOF);
+        mPhotosSpoof.setChecked(SystemProperties.getBoolean(SYS_PHOTOS_SPOOF, true));
+        mPhotosSpoof.setOnPreferenceChangeListener(this);
+
+        mStreamSpoof = (SwitchPreference) findPreference(KEY_STREAM_SPOOF);
+        mStreamSpoof.setChecked(SystemProperties.getBoolean(SYS_STREAM_SPOOF, true));
+        mStreamSpoof.setOnPreferenceChangeListener(this);
 
     }
 
     @Override
-    public boolean onPreferenceChange(Preference preference, Object objValue) {
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mGamesSpoof) {
+            boolean value = (Boolean) newValue;
+            SystemProperties.set(SYS_GAMES_SPOOF, value ? "true" : "false");
+            return true;
+        } else if (preference == mPhotosSpoof) {
+            boolean value = (Boolean) newValue;
+            SystemProperties.set(SYS_PHOTOS_SPOOF, value ? "true" : "false");
+            return true;
+        } else if (preference == mStreamSpoof) {
+            boolean value = (Boolean) newValue;
+            SystemProperties.set(SYS_STREAM_SPOOF, value ? "true" : "false");
+            return true;
+        }
         return false;
     }
 	

src/com/cherish/settings/fragments/QuickSettings.java

@@ -17,6 +17,7 @@ import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.SwitchPreference;
 import com.cherish.settings.preferences.CustomSeekBarPreference;
 import android.provider.Settings;
+import android.util.Log;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import java.util.Locale;
@@ -37,11 +38,15 @@ import java.util.ArrayList;
 public class QuickSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 			
+	private static final boolean DEBUG = false;
+			
 	private static final String QS_FOOTER_TEXT_STRING = "qs_footer_text_string";
+	private static final String SYSTEM_INFO = "qs_system_info";
 
     private SystemSettingEditTextPreference mFooterString;
 			
 	private ListPreference mQuickPulldown;
+	private ListPreference mSysInfo;
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -103,6 +108,31 @@ public class QuickSettings extends SettingsPreferenceFragment implements
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
 	
+	private void configureSystemInfo() {
+        Resources res = getResources();
+        String[] entriesArray = res.getStringArray(R.array.qs_system_info_entries);
+        String[] valuesArray = res.getStringArray(R.array.qs_system_info_values);
+        String[] checksArray = res.getStringArray(R.array.qs_system_info_checks);
+        List<String> entries = new ArrayList<>();
+        List<String> values = new ArrayList<>();
+
+        entries.add(entriesArray[0]);
+        values.add(valuesArray[0]);
+        int count = valuesArray.length;
+        for (int i = 1 ; i < count ; i++) {
+            int resID = res.getIdentifier(checksArray[i-1], "string", "android");
+            if (DEBUG) Log.d("systemInfo", "resID= " + resID);
+            if (resID > 0 && !res.getString(resID).isEmpty()) {
+                  if (DEBUG) Log.d("systemInfo", "sysPath= " + res.getString(resID));
+                  entries.add(entriesArray[i]);
+                  values.add(valuesArray[i]);
+            }
+        }
+        mSysInfo.setEntries(entries.toArray(new String[entries.size()]));
+        mSysInfo.setEntryValues(values.toArray(new String[values.size()]));
+        if (entries.size() < 2) mSysInfo.getParent().removePreference(mSysInfo);
+    }
+	
 	/**
      * For Search.
      */

src/com/cherish/settings/fragments/ThemeSettings.java

@@ -68,17 +68,22 @@ import net.margaritov.preference.colorpicker.ColorPickerPreference;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class ThemeSettings extends DashboardFragment implements OnPreferenceChangeListener {
-	
-	private static final String SETTINGS_DASHBOARD_GMS = "settings_dashboard_gms";
 			
 	public static final String TAG = "ThemeSettings";
+	private static final String ALT_SETTINGS_LAYOUT = "alt_settings_layout";
+    private static final String SETTINGS_DASHBOARD_STYLE = "settings_dashboard_style";
+    private static final String USE_STOCK_LAYOUT = "use_stock_layout";
+    private static final String DISABLE_USERCARD = "disable_usercard";
     static final int DEFAULT_QS_PANEL_COLOR = 0xffffffff;
 	static final int DEFAULT = 0xff1a73e8;
 	private Context mContext;
-	private SystemSettingListPreference mSettingsDashBoardGms;
+
-	
     private IOverlayManager mOverlayService;
     private UiModeManager mUiModeManager;
+	private SystemSettingListPreference mSettingsDashBoardStyle;
+    private SystemSettingSwitchPreference mAltSettingsLayout;
+    private SystemSettingSwitchPreference mUseStockLayout;
+    private SystemSettingSwitchPreference mDisableUserCard; 
 	
 	@Override
     protected String getLogTag() {
@@ -111,8 +116,14 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
 		final Resources res = getResources();
 		mContext =  getActivity();
 		
-		mSettingsDashBoardGms = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_GMS);
+		mSettingsDashBoardStyle = (SystemSettingListPreference) findPreference(SETTINGS_DASHBOARD_STYLE);
-        mSettingsDashBoardGms.setOnPreferenceChangeListener(this);
+        mSettingsDashBoardStyle.setOnPreferenceChangeListener(this);
+        mAltSettingsLayout = (SystemSettingSwitchPreference) findPreference(ALT_SETTINGS_LAYOUT);
+        mAltSettingsLayout.setOnPreferenceChangeListener(this);
+        mUseStockLayout = (SystemSettingSwitchPreference) findPreference(USE_STOCK_LAYOUT);
+        mUseStockLayout.setOnPreferenceChangeListener(this);
+        mDisableUserCard = (SystemSettingSwitchPreference) findPreference(DISABLE_USERCARD);
+        mDisableUserCard.setOnPreferenceChangeListener(this);
         }
 
     public boolean isAvailable() {
@@ -122,10 +133,19 @@ public class ThemeSettings extends DashboardFragment implements OnPreferenceChan
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-		 if (preference == mSettingsDashBoardGms) {
+	  if (preference == mSettingsDashBoardStyle) {
             CherishUtils.showSettingsRestartDialog(getContext());
             return true;
-		 }
+        } else if (preference == mAltSettingsLayout) {
+            CherishUtils.showSettingsRestartDialog(getContext());
+            return true;
+        } else if (preference == mUseStockLayout) {
+            CherishUtils.showSettingsRestartDialog(getContext());
+            return true;
+        } else if (preference == mDisableUserCard) {
+            CherishUtils.showSettingsRestartDialog(getContext());
+            return true;
+		}
         return false;
     }