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

Commit 84a0667a authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Support PreferenceActivity.isValidFragmen" into ics-ub-clock-amazon

parents 03aba76b 339b3be0
Loading
Loading
Loading
Loading
+5 −7
Original line number Diff line number Diff line
@@ -16,18 +16,11 @@

package com.android.deskclock;

import android.app.ActionBar;
import android.content.Intent;
import android.media.AudioManager;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceScreen;
import android.provider.Settings;
import android.view.Menu;
import android.view.MenuItem;

/**
 * Settings for the Alarm Clock Dream (com.android.deskclock.Screensaver).
@@ -74,4 +67,9 @@ public class ScreensaverSettingsActivity extends PreferenceActivity
        pref.setOnPreferenceChangeListener(this);
    }

    @Override
    protected boolean isValidFragment(String fragmentName) {
        // This activity is not exported so we can just approve everything
        return true;
    }
}
+6 −0
Original line number Diff line number Diff line
@@ -177,6 +177,12 @@ public class SettingsActivity extends PreferenceActivity
        return true;
    }

    @Override
    protected boolean isValidFragment(String fragmentName) {
        // Exported activity but no headers we support.
        return false;
    }

    private void updateAutoSnoozeSummary(ListPreference listPref,
            String delay) {
        int i = Integer.parseInt(delay);