Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f373b807 authored by Dave Kessler's avatar Dave Kessler Committed by Abhisek Devkota
Browse files

Status Bar Clock: rewrite for lollipop and add left clock (2/2) 

Add clock mods to cm-12.0 with new left position

[mikeioannina]: Adapt for CyanogenMod

Change-Id: I3a53952a032b2241fa6dcca9b3a063b068af4ff4
parent 13f4da0f

res/values/cm_arrays.xml

+33 −0
Original line number Diff line number Diff line
@@ -423,6 +423,39 @@ 
        <item>Custom</item>

    </string-array>



    <string-array name="status_bar_clock_style_entries" translatable="false">

        <item>@string/status_bar_clock_style_right</item>

        <item>@string/status_bar_clock_style_center</item>

        <item>@string/status_bar_clock_style_left</item>

        <item>@string/status_bar_clock_style_hidden</item>

    </string-array>



    <string-array name="status_bar_clock_style_entries_rtl" translatable="false">

        <item>@string/status_bar_clock_style_left</item>

        <item>@string/status_bar_clock_style_center</item>

        <item>@string/status_bar_clock_style_right</item>

        <item>@string/status_bar_clock_style_hidden</item>

    </string-array>



    <string-array name="status_bar_clock_style_values" translatable="false">

        <item>1</item>

        <item>2</item>

        <item>3</item>

        <item>0</item>

    </string-array>



    <string-array name="status_bar_am_pm_entries" translatable="false">

        <item>@string/status_bar_am_pm_normal</item>

        <item>@string/status_bar_am_pm_small</item>

        <item>@string/status_bar_am_pm_hidden</item>

    </string-array>



    <string-array name="status_bar_am_pm_values" translatable="false">

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



    <string-array name="status_bar_battery_style_entries" translatable="false">

        <item>@string/status_bar_battery_style_icon_portrait</item>

        <item>@string/status_bar_battery_style_icon_landscape</item>

res/values/cm_strings.xml

+13 −0
Original line number Diff line number Diff line
@@ -420,6 +420,19 @@ 
    <string name="status_bar_notif_count_title">Show notification count</string>

    <string name="status_bar_notif_count_summary">Display the number of pending notifications</string>



    <!-- Status bar - Clock -->

    <string name="status_bar_clock_style_title">Clock style</string>

    <string name="status_bar_clock_style_right">Right</string>

    <string name="status_bar_clock_style_left">Left</string>

    <string name="status_bar_clock_style_center">Center</string>

    <string name="status_bar_clock_style_hidden">Hidden</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 (default)</string>



    <!-- Status bar - Battery -->

    <string name="status_bar_battery_style_title">Battery status style</string>

    <string name="status_bar_battery_style_icon_portrait">Icon portrait</string>

res/xml/status_bar_settings.xml

+14 −0
Original line number Diff line number Diff line
@@ -18,6 +18,20 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/status_bar_title">



    <ListPreference

        android:key="status_bar_clock"

        android:title="@string/status_bar_clock_style_title"

        android:dialogTitle="@string/status_bar_clock_style_title"

        android:entries="@array/status_bar_clock_style_entries"

        android:entryValues="@array/status_bar_clock_style_values" />



    <ListPreference

        android:key="status_bar_am_pm"

        android:title="@string/status_bar_am_pm_title"

        android:dialogTitle="@string/status_bar_am_pm_title"

        android:entries="@array/status_bar_am_pm_entries"

        android:entryValues="@array/status_bar_am_pm_values" />



    <ListPreference

        android:key="status_bar_battery_style"

        android:title="@string/status_bar_battery_style_title"

src/com/android/settings/cyanogenmod/StatusBarSettings.java

+68 −15
Original line number Diff line number Diff line 
/*

* Copyright (C) 2014 The CyanogenMod Project

 * Copyright (C) 2014-2015 The CyanogenMod Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -16,11 +16,14 @@ 
package com.android.settings.cyanogenmod;



import android.content.ContentResolver;

import android.content.res.Configuration;

import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference.OnPreferenceChangeListener;

import android.provider.Settings;

import android.text.format.DateFormat;

import android.view.View;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -30,12 +33,16 @@ public class StatusBarSettings extends SettingsPreferenceFragment 


    private static final String TAG = "StatusBar";



    private static final String STATUS_BAR_CLOCK_STYLE = "status_bar_clock";

    private static final String STATUS_BAR_AM_PM = "status_bar_am_pm";

    private static final String STATUS_BAR_BATTERY_STYLE = "status_bar_battery_style";

    private static final String STATUS_BAR_SHOW_BATTERY_PERCENT = "status_bar_show_battery_percent";



    private static final int STATUS_BAR_BATTERY_STYLE_HIDDEN = 4;

    private static final int STATUS_BAR_BATTERY_STYLE_TEXT = 6;



    private ListPreference mStatusBarClock;

    private ListPreference mStatusBarAmPm;

    private ListPreference mStatusBarBattery;

    private ListPreference mStatusBarBatteryShowPercent;
@@ -46,10 +53,30 @@ public class StatusBarSettings extends SettingsPreferenceFragment 


        ContentResolver resolver = getActivity().getContentResolver();



        mStatusBarClock = (ListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);

        mStatusBarAmPm = (ListPreference) findPreference(STATUS_BAR_AM_PM);



        mStatusBarBattery = (ListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);

        mStatusBarBatteryShowPercent =

                (ListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);



        int clockStyle = Settings.System.getInt(resolver,

                Settings.System.STATUS_BAR_CLOCK, 1);

        mStatusBarClock.setValue(String.valueOf(clockStyle));

        mStatusBarClock.setSummary(mStatusBarClock.getEntry());

        mStatusBarClock.setOnPreferenceChangeListener(this);



        if (DateFormat.is24HourFormat(getActivity())) {

            mStatusBarAmPm.setEnabled(false);

            mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);

        } else {

            int statusBarAmPm = Settings.System.getInt(resolver,

                    Settings.System.STATUS_BAR_AM_PM, 2);

            mStatusBarAmPm.setValue(String.valueOf(statusBarAmPm));

            mStatusBarAmPm.setSummary(mStatusBarAmPm.getEntry());

            mStatusBarAmPm.setOnPreferenceChangeListener(this);

        }



        int batteryStyle = Settings.System.getInt(resolver,

                Settings.System.STATUS_BAR_BATTERY_STYLE, 0);

        mStatusBarBattery.setValue(String.valueOf(batteryStyle));
@@ -64,10 +91,36 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
        mStatusBarBatteryShowPercent.setOnPreferenceChangeListener(this);

    }



    @Override

    public void onResume() {

        super.onResume();

        // Adjust clock position for RTL if necessary

        Configuration config = getResources().getConfiguration();

        if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {

                mStatusBarClock.setEntries(getActivity().getResources().getStringArray(

                        R.array.status_bar_clock_style_entries_rtl));

                mStatusBarClock.setSummary(mStatusBarClock.getEntry());

        }

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        ContentResolver resolver = getActivity().getContentResolver();

        if (preference == mStatusBarBattery) {

        if (preference == mStatusBarClock) {

            int clockStyle = Integer.parseInt((String) newValue);

            int index = mStatusBarClock.findIndexOfValue((String) newValue);

            Settings.System.putInt(

                    resolver, STATUS_BAR_CLOCK_STYLE, clockStyle);

            mStatusBarClock.setSummary(mStatusBarClock.getEntries()[index]);

            return true;

        } else if (preference == mStatusBarAmPm) {

            int statusBarAmPm = Integer.valueOf((String) newValue);

            int index = mStatusBarAmPm.findIndexOfValue((String) newValue);

            Settings.System.putInt(

                    resolver, STATUS_BAR_AM_PM, statusBarAmPm);

            mStatusBarAmPm.setSummary(mStatusBarAmPm.getEntries()[index]);

            return true;

        } else if (preference == mStatusBarBattery) {

            int batteryStyle = Integer.valueOf((String) newValue);

            int index = mStatusBarBattery.findIndexOfValue((String) newValue);

            Settings.System.putInt(