[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/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"