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

Commit 0f5fdd49 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: "Back" icon not work on Settings-Security-Encrypt phone"

parents 7e1f49d2 c1fe7f8f

src/com/android/settings/CryptKeeperConfirm.java

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public class CryptKeeperConfirm extends InstrumentedFragment { 
    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        setHasOptionsMenu(true);

        mContentView = inflater.inflate(R.layout.crypt_keeper_confirm, null);

        establishFinalConfirmationState();

        return mContentView;

src/com/android/settings/CryptKeeperSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public class CryptKeeperSettings extends InstrumentedFragment { 
    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

        setHasOptionsMenu(true);

        Activity activity = getActivity();

        Intent intent = activity.getIntent();

        if (DevicePolicyManager.ACTION_START_ENCRYPTION.equals(intent.getAction())) {