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

Commit 95674bc5 authored by Bruno Martins's avatar Bruno Martins Committed by Luca Stefani
Browse files

StatusBarSettings: Hide clock preference category based on icon visibility 

Change-Id: I50040083b8aae2b3de4fc40097326724c4fc7c78
parent e6298157

res/xml/status_bar_settings.xml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
    </PreferenceCategory>



    <PreferenceCategory

        android:key="status_bar_clock_key"

        android:title="@string/status_bar_clock_title">



        <lineageos.preference.LineageSystemSettingListPreference

src/org/lineageos/lineageparts/statusbar/StatusBarSettings.java

+32 −11
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014-2015 The CyanogenMod Project

 *               2017 The LineageOS Project

 *               2017-2018 The LineageOS Project

 *

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

 * you may not use this file except in compliance with the License.
@@ -17,7 +17,10 @@ 
package org.lineageos.lineageparts.statusbar;



import android.os.Bundle;

import android.provider.Settings;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceCategory;

import android.support.v7.preference.PreferenceScreen;

import android.support.v7.preference.Preference.OnPreferenceChangeListener;

import android.text.format.DateFormat;

import android.view.View;
@@ -30,6 +33,10 @@ import org.lineageos.lineageparts.SettingsPreferenceFragment; 
public class StatusBarSettings extends SettingsPreferenceFragment

        implements OnPreferenceChangeListener {



    private static final String CATEGORY_CLOCK = "status_bar_clock_key";



    private static final String ICON_BLACKLIST = "icon_blacklist";



    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";
@@ -48,24 +55,24 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    private LineageSystemSettingListPreference mStatusBarBattery;

    private LineageSystemSettingListPreference mStatusBarBatteryShowPercent;



    private PreferenceCategory mStatusBarClockCategory;



    @Override

    public void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        addPreferencesFromResource(R.xml.status_bar_settings);



        mStatusBarClock = (LineageSystemSettingListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);

/*

        mStatusBarBatteryShowPercent =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);

*/

        mStatusBarAmPm =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_AM_PM);

        mStatusBarClock =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_CLOCK_STYLE);



        mStatusBarAmPm = (LineageSystemSettingListPreference) findPreference(STATUS_BAR_AM_PM);

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

            mStatusBarAmPm.setEnabled(false);

            mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);

        }

        mStatusBarClockCategory =

                (PreferenceCategory) getPreferenceScreen().findPreference(CATEGORY_CLOCK);



/*

        mStatusBarBatteryShowPercent =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_SHOW_BATTERY_PERCENT);

        mStatusBarBattery =

                (LineageSystemSettingListPreference) findPreference(STATUS_BAR_BATTERY_STYLE);

        mStatusBarBattery.setOnPreferenceChangeListener(this);
@@ -82,6 +89,20 @@ public class StatusBarSettings extends SettingsPreferenceFragment 
    public void onResume() {

        super.onResume();



        final String curIconBlacklist = Settings.Secure.getString(getContext().getContentResolver(),

                ICON_BLACKLIST);



        if (curIconBlacklist != null && curIconBlacklist.contains("clock")) {

            getPreferenceScreen().removePreference(mStatusBarClockCategory);

        } else {

            getPreferenceScreen().addPreference(mStatusBarClockCategory);

        }



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

            mStatusBarAmPm.setEnabled(false);

            mStatusBarAmPm.setSummary(R.string.status_bar_am_pm_info);

        }



        // Adjust status bar preferences for RTL

        if (getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {

            mStatusBarClock.setEntries(R.array.status_bar_clock_position_entries_rtl);