diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 8f92019..2398e71 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -399,5 +399,126 @@
         <item>1</item>
         <item>2</item>
     </string-array>
+	
+	<!-- Status bar - Clock -->
+    <string-array name="status_bar_clock_position_entries" translatable="false">
+        <item>@string/status_bar_clock_position_right</item>
+        <item>@string/status_bar_clock_position_center</item>
+        <item>@string/status_bar_clock_position_left</item>
+        <item>@string/status_bar_clock_position_hidden</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_entries_rtl" translatable="false">
+        <item>@string/status_bar_clock_position_left</item>
+        <item>@string/status_bar_clock_position_center</item>
+        <item>@string/status_bar_clock_position_right</item>
+        <item>@string/status_bar_clock_position_hidden</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_values_rtl" translatable="false">
+        <item>2</item>
+        <item>1</item>
+        <item>0</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_entries_notch" translatable="false">
+        <item>@string/status_bar_clock_position_right</item>
+        <item>@string/status_bar_clock_position_left</item>
+        <item>@string/status_bar_clock_position_hidden</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_values_notch" translatable="false">
+        <item>0</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_entries_notch_rtl" translatable="false">
+        <item>@string/status_bar_clock_position_left</item>
+        <item>@string/status_bar_clock_position_right</item>
+        <item>@string/status_bar_clock_position_hidden</item>
+    </string-array>
+
+    <string-array name="status_bar_clock_position_values_notch_rtl" translatable="false">
+        <item>2</item>
+        <item>0</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="status_bar_am_pm_entries" translatable="false">
+        <item>@string/status_bar_am_pm_hidden</item>
+        <item>@string/status_bar_am_pm_normal</item>
+        <item>@string/status_bar_am_pm_small</item>
+    </string-array>
+
+    <string-array name="status_bar_am_pm_values" translatable="false">
+        <item>2</item>
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="clock_date_position_entries" translatable="false">
+        <item>@string/clock_date_left</item>
+        <item>@string/clock_date_right</item>
+    </string-array>
+
+    <string-array name="clock_date_position_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
+    <string-array name="status_bar_date_entries">
+        <item>@string/status_bar_date_none</item>
+        <item>@string/status_bar_date_small</item>
+        <item>@string/status_bar_date_normal</item>
+    </string-array>
+
+    <string-array name="status_bar_date_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="status_bar_date_style_entries">
+        <item>@string/status_bar_date_style_normal</item>
+        <item>@string/status_bar_date_style_lowercase</item>
+        <item>@string/status_bar_date_style_uppercase</item>
+    </string-array>
+
+    <string-array name="status_bar_date_style_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="status_bar_date_format_entries_values" translatable="false">
+        <item>dd/MM/yy</item>
+        <item>MM/dd/yy</item>
+        <item>yyyy-MM-dd</item>
+        <item>yyyy-dd-MM</item>
+        <item>dd-MM-yyyy</item>
+        <item>MM-dd-yyyy</item>
+        <item>MMM dd</item>
+        <item>MMM dd, yyyy</item>
+        <item>MMMM dd, yyyy</item>
+        <item>EEE</item>
+        <item>EEE dd</item>
+        <item>EEE dd/MM</item>
+        <item>EEE MM/dd</item>
+        <item>EEE dd MMM</item>
+        <item>EEE MMM dd</item>
+        <item>EEE MMMM dd</item>
+        <item>EEEE dd/MM</item>
+        <item>EEEE MM/dd</item>
+        <item>@string/status_bar_date_format_custom</item>
+    </string-array>
 
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 0ad4f6e..53c8067 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -568,5 +568,51 @@
     <string name="screen_off_animation_title">Screen off animation</string>
     <string name="screen_off_animation_crt">CRT</string>
     <string name="screen_off_animation_scale">Scale</string>
+	
+	<!-- Status bar - Clock -->
+    <string name="status_bar_clock_title">Clock &amp; date</string>
+    <string name="status_bar_clock_summary">Customize clock &amp; date</string>
+    <string name="status_bar_clock_seconds_title">Clock seconds</string>
+    <string name="status_bar_clock_seconds_summary">Display seconds next to clock in status bar</string>
+    <string name="status_bar_clock_position_title">Clock style</string>
+    <string name="status_bar_clock_position_right">Right</string>
+    <string name="status_bar_clock_position_left">Left</string>
+    <string name="status_bar_clock_position_center">Center</string>
+    <string name="status_bar_clock_position_hidden">Hidden</string>
+    <string name="status_bar_clock_auto_hide_title">Auto hide</string>
+    <string name="status_bar_clock_auto_hide_launcher_summary">Hide clock if launcher is visible</string>
+    <string name="status_bar_clock_auto_hide_summary">Hide clock at regular interval</string>
+    <string name="status_bar_clock_auto_hide_hdur_title">Hide duration</string>
+    <string name="status_bar_clock_auto_hide_hdur_summary">Number of seconds to hide clock</string>
+    <string name="status_bar_clock_auto_hide_sdur_title">Show duration</string>
+    <string name="status_bar_clock_auto_hide_sdur_summary">Number of seconds to wait before hiding clock</string>
+    <string name="status_bar_am_pm_title">AM/PM style</string>
+    <string name="status_bar_am_pm_info">24-hour clock is enabled</string>
+    <string name="status_bar_am_pm_normal">Normal</string>
+    <string name="status_bar_am_pm_small">Small</string>
+    <string name="status_bar_am_pm_hidden">Hidden</string>
+    <string name="status_bar_date_title">Date</string>
+    <string name="status_bar_date_none">Hidden</string>
+    <string name="status_bar_date_small">Small</string>
+    <string name="status_bar_date_normal">Normal</string>
+    <string name="status_bar_date_format_title">Date format</string>
+    <string name="status_bar_date_style">Date style</string>
+    <string name="status_bar_date_style_normal">Normal</string>
+    <string name="status_bar_date_style_lowercase">Lowercase</string>
+    <string name="status_bar_date_style_uppercase">Uppercase</string>
+    <string name="status_bar_date_format_custom">Custom java format</string>
+    <string name="status_bar_date_string_edittext_title">Must be in DateFormat eg. MM/dd/yy</string>
+    <string name="status_bar_date_string_edittext_summary">Enter string</string>
+    <string name="clock_date_position">Date position</string>
+    <string name="clock_date_right">Right of time</string>
+    <string name="clock_date_left">Left of time</string>
+
+    <!-- QS clock -->
+    <string name="qs_clock_title">Clock</string>
+    <string name="qs_clock_summary">Display clock in quick status bar header</string>
+
+    <!-- QS date -->
+    <string name="qs_date_title">Date</string>
+    <string name="qs_date_summary">Display date in quick status bar header</string>
 
 </resources>
diff --git a/res/xml/cherish_settings_status_bar_clock.xml b/res/xml/cherish_settings_status_bar_clock.xml
new file mode 100644
index 0000000..fbe6335
--- /dev/null
+++ b/res/xml/cherish_settings_status_bar_clock.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2020-2022 The CherishOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/status_bar_clock_title">
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_clock_auto_hide_launcher"
+        android:title="@string/status_bar_clock_auto_hide_title"
+        android:summary="@string/status_bar_clock_auto_hide_launcher_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_clock_auto_hide"
+        android:title="@string/status_bar_clock_auto_hide_title"
+        android:summary="@string/status_bar_clock_auto_hide_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="status_bar_clock_auto_hide_hduration"
+        android:title="@string/status_bar_clock_auto_hide_hdur_title"
+        android:summary="@string/status_bar_clock_auto_hide_hdur_summary"
+        android:max="300"
+        settings:min="5"
+        settings:interval="5"
+        android:dependency="status_bar_clock_auto_hide"
+        android:defaultValue="60"
+        settings:units="@string/unit_seconds" />
+
+    <com.cherish.settings.preferences.SystemSettingSeekBarPreference
+        android:key="status_bar_clock_auto_hide_sduration"
+        android:title="@string/status_bar_clock_auto_hide_sdur_title"
+        android:summary="@string/status_bar_clock_auto_hide_sdur_summary"
+        android:max="300"
+        settings:min="5"
+        settings:interval="5"
+        android:dependency="status_bar_clock_auto_hide"
+        android:defaultValue="5"
+        settings:units="@string/unit_seconds" />
+
+    <com.cherish.settings.preferences.SystemSettingSwitchPreference
+        android:key="status_bar_clock_seconds"
+        android:title="@string/status_bar_clock_seconds_title"
+        android:summary="@string/status_bar_clock_seconds_summary"
+        android:defaultValue="false" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_am_pm"
+        android:title="@string/status_bar_am_pm_title"
+        android:summary="%s"
+        android:dialogTitle="@string/status_bar_am_pm_title"
+        android:entries="@array/status_bar_am_pm_entries"
+        android:entryValues="@array/status_bar_am_pm_values"
+        android:defaultValue="2" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_clock_date_display"
+        android:title="@string/status_bar_date_title"
+        android:entries="@array/status_bar_date_entries"
+        android:entryValues="@array/status_bar_date_values"
+        android:defaultValue="0" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_clock_date_position"
+        android:title="@string/clock_date_position"
+        android:entries="@array/clock_date_position_entries"
+        android:entryValues="@array/clock_date_position_values"
+        android:defaultValue="0" />
+
+    <com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_clock_date_style"
+        android:title="@string/status_bar_date_style"
+        android:entries="@array/status_bar_date_style_entries"
+        android:entryValues="@array/status_bar_date_style_values"
+        android:defaultValue="0" />
+
+    <ListPreference
+        android:key="status_bar_clock_date_format"
+        android:title="@string/status_bar_date_format_title"
+        android:entries="@array/status_bar_date_format_entries_values"
+        android:entryValues="@array/status_bar_date_format_entries_values" />
+</PreferenceScreen>
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index b4e2ebc..898c1a9 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -35,6 +35,21 @@
         android:fragment="com.cherish.settings.fragments.Traffic"
         android:title="@string/traffic_title"
         android:summary="@string/traffic_summary" />
+		
+		<com.cherish.settings.preferences.SystemSettingListPreference
+        android:key="status_bar_clock"
+        android:title="@string/status_bar_clock_position_title"
+        android:summary="%s"
+        android:dialogTitle="@string/status_bar_clock_position_title"
+        android:entries="@array/status_bar_clock_position_entries"
+        android:entryValues="@array/status_bar_clock_position_values"
+        android:defaultValue="2" />
+
+    <Preference
+        android:key="clock"
+        android:title="@string/status_bar_clock_title"
+        android:summary="@string/status_bar_clock_summary"
+        android:fragment="com.cherish.settings.fragments.Clock" />
 			
 		<com.cherish.settings.preferences.SystemSettingSwitchPreference
             android:key="data_disabled_icon"
diff --git a/src/com/cherish/settings/fragments/Clock.java b/src/com/cherish/settings/fragments/Clock.java
new file mode 100644
index 0000000..ff85b98
--- /dev/null
+++ b/src/com/cherish/settings/fragments/Clock.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020-2022 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.
+ */
+package com.cherish.settings.fragments;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.format.DateFormat;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.util.cherish.CherishUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import com.cherish.settings.preferences.SecureSettingSwitchPreference;
+import com.cherish.settings.preferences.SystemSettingListPreference;
+import com.cherish.settings.preferences.SystemSettingSeekBarPreference;
+import com.cherish.settings.preferences.SystemSettingSwitchPreference;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class Clock extends SettingsPreferenceFragment implements
+        Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "Clock";
+
+    private static final String STATUS_BAR_AM_PM = "status_bar_am_pm";
+
+    private SystemSettingListPreference mStatusBarAmPm;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        addPreferencesFromResource(R.xml.cherish_settings_status_bar_clock);
+        final ContentResolver resolver = getActivity().getContentResolver();
+        final Context mContext = getActivity().getApplicationContext();
+        final PreferenceScreen prefScreen = getPreferenceScreen();
+
+        mStatusBarAmPm =
+                (SystemSettingListPreference) findPreference(STATUS_BAR_AM_PM);
+
+        if (DateFormat.is24HourFormat(getActivity())) {
+            mStatusBarAmPm.setEnabled(false);
+            mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        ContentResolver resolver = getActivity().getContentResolver();
+        return false;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.CHERISH_SETTINGS;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.cherish_settings_status_bar_clock);
+}
diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java
index 7eb652d..3eac0b6 100644
--- a/src/com/cherish/settings/fragments/StatusBarSettings.java
+++ b/src/com/cherish/settings/fragments/StatusBarSettings.java
@@ -52,8 +52,10 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
     private static final String SYSTEMUI_PACKAGE = "com.android.systemui";
     private static final String CONFIG_RESOURCE_NAME = "flag_combined_status_bar_signal_icons";
     private static final String COBINED_STATUSBAR_ICONS = "show_combined_status_bar_signal_icons";
+	private static final String STATUS_BAR_CLOCK_STYLE = "status_bar_clock";
 
     private SecureSettingSwitchPreference mCombinedIcons;
+	private SystemSettingListPreference mStatusBarClock;
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -61,6 +63,7 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
         addPreferencesFromResource(R.xml.cherish_settings_statusbar);
 		
 	PreferenceScreen prefSet = getPreferenceScreen();
+	final Context mContext = getActivity().getApplicationContext();
         final ContentResolver resolver = getActivity().getContentResolver();
 
         mCombinedIcons = (SecureSettingSwitchPreference)
@@ -83,6 +86,23 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
                 COBINED_STATUSBAR_ICONS, def ? 1 : 0) == 1;
         mCombinedIcons.setChecked(enabled);
         mCombinedIcons.setOnPreferenceChangeListener(this);
+		
+		mStatusBarClock =
+                (SystemSettingListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);
+
+        // Adjust status bar preferences for RTL
+        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
+            if (CherishUtils.hasNotch(mContext)) {
+                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch_rtl);
+                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch_rtl);
+            } else {
+                mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_rtl);
+                mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_rtl);
+            }
+        } else if (CherishUtils.hasNotch(mContext)) {
+            mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_notch);
+            mStatusBarClock.setEntryValues(R.array.status_bar_clock_position_values_notch);
+        }
     }
 
     @Override