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

Commit d847d424 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix logging spam in DashboardFragment."

parents 45a072ec 242da311

src/com/android/settings/core/PreferenceController.java

+5 −5
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ public abstract class PreferenceController { 
        }

    }



    /**

     * Returns true if preference is available (should be displayed)

     */

    public abstract boolean isAvailable();



    /**

     * Handles preference tree click

     *
@@ -87,9 +92,4 @@ public abstract class PreferenceController { 
            screen.removePreference(pref);

        }

    }



    /**

     * Returns true if preference is available (should be displayed)

     */

    protected abstract boolean isAvailable();

}

src/com/android/settings/dashboard/DashboardFragment.java

+5 −1
Original line number Diff line number Diff line
@@ -251,11 +251,15 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment 
        Collection<PreferenceController> controllers = mPreferenceControllers.values();

        final PreferenceScreen screen = getPreferenceScreen();

        for (PreferenceController controller : controllers) {

            if (!controller.isAvailable()) {

                continue;

            }

            final String key = controller.getPreferenceKey();



            final Preference preference = mProgressiveDisclosureMixin.findPreference(screen, key);

            if (preference == null) {

                Log.d(TAG, "Cannot find preference with key " + key);

                Log.d(TAG, String.format("Cannot find preference with key %s in Controller %s",

                        key, controller.getClass().getSimpleName()));

                continue;

            }

            controller.updateState(preference);

src/com/android/settings/deviceinfo/AdditionalSystemUpdatePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public class AdditionalSystemUpdatePreferenceController extends PreferenceContro 
    }



    @Override

    protected boolean isAvailable() {

    public boolean isAvailable() {

        return mContext.getResources().getBoolean(

                com.android.settings.R.bool.config_additional_system_update_setting_enable);

    }

src/com/android/settings/deviceinfo/ManageStoragePreferenceController.java

+1 −4
Original line number Diff line number Diff line
@@ -17,13 +17,10 @@ package com.android.settings.deviceinfo; 


import android.content.Context;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.core.PreferenceController;



import java.util.List;



public class ManageStoragePreferenceController extends PreferenceController {



    public static final String KEY_MANAGE_STORAGE = "pref_manage_storage";
@@ -43,7 +40,7 @@ public class ManageStoragePreferenceController extends PreferenceController { 
    }



    @Override

    protected boolean isAvailable() {

    public boolean isAvailable() {

        return mContext.getResources().getBoolean(R.bool.config_storage_manager_settings_enabled);

    }

}

src/com/android/settings/deviceinfo/SystemUpdatePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class SystemUpdatePreferenceController extends PreferenceController { 
    }



    @Override

    protected boolean isAvailable() {

    public boolean isAvailable() {

        return mUm.isAdminUser();

    }