[SQUASHED] Remove Carrier Label for now [2/2]

Revert "Carrier label: Ensure the dialog matches other dialogs"

This reverts commit 0a675cad6c.

Revert "Notch friendly carrier label [2/2]"

This reverts commit b4c3f73bb6.

Revert "Set a text length on the carrier label"

This reverts commit 1ff3e9673b.

Revert "Custom Carrier Label & Carrier Label Placement [2/2]"

This reverts commit df39ae045c.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

res/values/cherish_arrays.xml

@@ -216,20 +216,6 @@
         <item>2</item>
     </string-array>
 
-    <!-- Carrier Label -->
-    <string-array name="carrier_label_entries" translatable="false">
-        <item>@string/show_carrier_disabled</item>
-        <item>@string/show_carrier_keyguard</item>
-        <item>@string/show_carrier_statusbar</item>
-        <item>@string/show_carrier_enabled</item>
-    </string-array>
-    <string-array name="carrier_label_values" translatable="false">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-
     <!-- Battery percent -->
     <string-array name="battery_percent_entries">
         <item>@string/status_bar_battery_percentage_default</item>

res/values/cherish_strings.xml

@@ -38,7 +38,7 @@
     <string name="recents_title">Recents apps</string>
     <string name="recents_summary">Slim recents</string>
     <string name="statusbar_title">Status bar</string>
-    <string name="statusbar_summary">Clock, carrier, status icons</string>
+    <string name="statusbar_summary">Clock, status icons</string>
     <string name="volume_title">Volume rockers</string>
     <string name="volume_summary">Volume rockers</string>
     <string name="notifications_title">Notifications</string>
@@ -420,18 +420,6 @@
     <string name="notification_guts_kill_app_button_title">Kill app button</string>
     <string name="notification_guts_kill_app_button_summary">Show a kill app button in the notification\'s longpress menu</string>
 
-    <!-- Custom carrier label and position -->
-    <string name="carrier_label_settings_title">Carrier label</string>
-    <string name="carrier_label_settings_summary">Customize the carrier label</string>
-    <string name="custom_carrier_label_title">Custom carrier label</string>
-    <string name="custom_carrier_label_explain">Enter a custom label. Leave blank to use your network name</string>
-    <string name="custom_carrier_label_notset">Custom label currently not set</string>
-    <string name="show_carrier_title">Carrier label location</string>
-    <string name="show_carrier_disabled">Disabled</string>
-    <string name="show_carrier_keyguard">Lockscreen</string>
-    <string name="show_carrier_statusbar">Statusbar</string>
-    <string name="show_carrier_enabled">Both</string>
-
     <!-- Double Tap on Doze to wake -->
     <string name="double_tap_on_doze_to_wake_title">Double-tap to wake on doze</string>
     <string name="double_tap_on_doze_to_wake_summary">Double tap to wake when device is dreaming</string>

res/xml/carrier_label.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The CherishOS Project
-
-     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/carrier_label_settings_title"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="status_bar_show_carrier"
-        android:title="@string/show_carrier_title"
-        android:defaultValue="1" />
-
-    <Preference
-        android:key="custom_carrier_label"
-        android:title="@string/custom_carrier_label_title" />
-
-</PreferenceScreen>

res/xml/cherish_settings_statusbar.xml

@@ -30,11 +30,6 @@
         android:key="statusbar_icons"
         android:title="@string/sb_icons">
 		
-		<Preference
-        android:key="carrier_label"
-        android:fragment="com.cherish.settings.fragments.CarrierLabel"
-        android:title="@string/carrier_label_settings_title" />
-		
 		<Preference
             android:key="status_bar_clock"
             android:fragment="com.cherish.settings.fragments.ClockDateSettings"