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

Commit e5f812c6 authored by Roman Birg's avatar Roman Birg
Browse files

Settings: add a way to open blacklist settings externally



Opening the activity doesn't theme the switch bar - an alias works.

Change-Id: I78efb382f4f1f4d208f122fedb0d71a86b515405
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 853405b5
Loading
Loading
Loading
Loading
+13 −1
Original line number Diff line number Diff line
@@ -1826,7 +1826,6 @@

        <!-- "Blacklist settings" UI, used only on voice-capable phone devices. -->
        <activity android:name="Settings$BlacklistSettingsActivity"
                android:theme="@style/Theme.SubSettingsDialogWhenLarge"
                android:uiOptions="splitActionBarWhenNarrow"
                android:label="@string/blacklist_title"
                android:excludeFromRecents="true">
@@ -1840,6 +1839,19 @@
                android:resource="@id/security_settings" />
        </activity>

        <activity-alias android:name=".blacklist.BlacklistSettings"
                android:taskAffinity="com.android.settings"
                android:label="@string/blacklist_title"
                android:targetActivity="Settings$BlacklistSettingsActivity"
                android:configChanges="orientation|keyboardHidden|screenSize"
                android:exported="true">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.blacklist.BlacklistSettings" />
            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
                       android:resource="@id/security_settings" />
        </activity-alias>


        <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
        <activity android:name="Settings$CryptKeeperSettingsActivity"
                android:label="@string/crypt_keeper_encrypt_title">
+4 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.widget.TextView;

import com.android.internal.telephony.util.BlacklistUtils;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.cyanogenmod.BaseSystemSettingSwitchBar;

@@ -146,7 +147,7 @@ public class BlacklistSettings extends ListFragment
    public boolean onOptionsItemSelected(MenuItem item) {
        switch (item.getItemId()) {
            case R.id.blacklist_prefs:
                SubSettings pa = (SubSettings) getActivity();
                SettingsActivity pa = (SettingsActivity) getActivity();
                pa.startPreferencePanel(BlacklistPreferences.class.getCanonicalName(), null,
                        0, null, this, 0);
                return true;
@@ -158,7 +159,7 @@ public class BlacklistSettings extends ListFragment
    @Override
    public void onStart() {
        super.onStart();
        final SubSettings activity = (SubSettings) getActivity();
        final SettingsActivity activity = (SettingsActivity) getActivity();
        mEnabledSwitch = new BaseSystemSettingSwitchBar(activity, activity.getSwitchBar(),
                Settings.System.PHONE_BLACKLIST_ENABLED, true, this);
    }
@@ -167,7 +168,7 @@ public class BlacklistSettings extends ListFragment
    public void onResume() {
        super.onResume();

        final SubSettings activity = (SubSettings) getActivity();
        final SettingsActivity activity = (SettingsActivity) getActivity();
        if (mEnabledSwitch != null) {
            mEnabledSwitch.resume(activity);
        }