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

Commit a677ee21 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Whitelist fragments appropriate for an activity 

Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
parent 040ce605

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -823,7 +823,6 @@ 
            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />

                <action android:name="android.credentials.UNLOCK" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="com.android.settings.SHORTCUT" />

src/com/android/settings/ChooseLockGeneric.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.app.Activity;

import android.app.Fragment;

import android.app.PendingIntent;

import android.app.admin.DevicePolicyManager;

import android.content.Context;
@@ -35,6 +36,7 @@ import android.view.ViewGroup; 
import android.widget.ListView;



import com.android.internal.widget.LockPatternUtils;

import com.android.settings.ConfirmLockPattern.ConfirmLockPatternFragment;



import java.util.List;
@@ -50,6 +52,12 @@ public class ChooseLockGeneric extends PreferenceActivity { 
        return modIntent;

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        if (ChooseLockGenericFragment.class.getName().equals(fragmentName)) return true;

        return false;

    }



    public static class ChooseLockGenericFragment extends SettingsPreferenceFragment {

        private static final int MIN_PASSWORD_LENGTH = 4;

        private static final String KEY_UNLOCK_BACKUP_INFO = "unlock_backup_info";

src/com/android/settings/ChooseLockPassword.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.PasswordEntryKeyboardHelper;

import com.android.internal.widget.PasswordEntryKeyboardView;

import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;



import android.app.Activity;

import android.app.Fragment;
@@ -64,6 +65,12 @@ public class ChooseLockPassword extends PreferenceActivity { 
        return modIntent;

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        if (ChooseLockPasswordFragment.class.getName().equals(fragmentName)) return true;

        return false;

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        // TODO: Fix on phones

src/com/android/settings/ChooseLockPattern.java

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.LockPatternView;

import com.android.internal.widget.LockPatternView.Cell;

import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;



import static com.android.internal.widget.LockPatternView.DisplayMode;
@@ -68,6 +69,12 @@ public class ChooseLockPattern extends PreferenceActivity { 
        return modIntent;

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        if (ChooseLockPatternFragment.class.getName().equals(fragmentName)) return true;

        return false;

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        // requestWindowFeature(Window.FEATURE_NO_TITLE);

src/com/android/settings/ConfirmLockPassword.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.PasswordEntryKeyboardHelper;

import com.android.internal.widget.PasswordEntryKeyboardView;

import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;



import android.app.Activity;

import android.app.Fragment;
@@ -51,6 +52,12 @@ public class ConfirmLockPassword extends PreferenceActivity { 
        return modIntent;

    }



    @Override

    protected boolean isValidFragment(String fragmentName) {

        if (ConfirmLockPasswordFragment.class.getName().equals(fragmentName)) return true;

        return false;

    }



    @Override

    public void onCreate(Bundle savedInstanceState) {

        // Disable IME on our window since we provide our own keyboard