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

Commit cd0da9c1 authored by Alex Chau's avatar Alex Chau Committed by Android (Google) Code Review
Browse files

Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev

parents ed672cfc ccade402

res/layout/redaction_interstitial.xml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
            android:textAppearance="?android:attr/textAppearanceMedium" />



    <RadioGroup

            android:id="@+id/radio_group"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

res/layout/setup_redaction_interstitial.xml

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
            android:text="@string/lock_screen_notifications_interstitial_message" />



        <RadioGroup

            android:id="@+id/radio_group"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/redaction_vertical_margins"

src/com/android/settings/ChooseLockPassword.java

+4 −1
Original line number Diff line number Diff line
@@ -559,7 +559,10 @@ public class ChooseLockPassword extends SettingsActivity { 
            getActivity().finish();

            mDone = true;

            if (!wasSecureBefore) {

                startActivity(getRedactionInterstitialIntent(getActivity()));

                Intent intent = getRedactionInterstitialIntent(getActivity());

                if (intent != null) {

                    startActivity(intent);

                }

            }

        }

src/com/android/settings/ChooseLockPattern.java

+8 −2
Original line number Diff line number Diff line
@@ -641,7 +641,10 @@ public class ChooseLockPattern extends SettingsActivity { 
                startVerifyPattern(utils, wasSecureBefore);

            } else {

                if (!wasSecureBefore) {

                    startActivity(getRedactionInterstitialIntent(getActivity()));

                    Intent intent = getRedactionInterstitialIntent(getActivity());

                    if (intent != null) {

                        startActivity(intent);

                    }

                }

                getActivity().setResult(RESULT_FINISHED);

                doFinish();
@@ -670,7 +673,10 @@ public class ChooseLockPattern extends SettingsActivity { 
                            mPendingLockCheck = null;



                            if (!wasSecureBefore) {

                                startActivity(getRedactionInterstitialIntent(getActivity()));

                                Intent intent = getRedactionInterstitialIntent(getActivity());

                                if (intent != null) {

                                    startActivity(intent);

                                }

                            }



                            Intent intent = new Intent();

src/com/android/settings/DropDownPreference.java

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ public class DropDownPreference extends Preference { 
        mValues.add(value);

    }



    public int getItemCount() {

        return mAdapter.getCount();

    }



    public void clearItems(){

        mAdapter.clear();

        mValues.clear();