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

Commit 31467520 authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Show second warning screen before converting to FBE 

Bug: 27126952
Change-Id: If045a0676600f4f9611ab27cfb686b8078b3cd5a
parent 8d41c204

res/layout/confirm_convert_fbe.xml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical"

            android:layout_marginBottom="12dp" >



        <TextView

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginStart="12dp"

                android:layout_marginEnd="12dp"

                android:layout_marginTop="12dp"

                android:textSize="18sp"

                android:text="@string/confirm_convert_to_fbe_warning" />



        <LinearLayout

                android:layout_width="wrap_content"

                android:layout_height="fill_parent"

                android:layout_gravity="center"

                android:orientation="horizontal">

            <Button

                    android:id="@+id/button_confirm_convert_fbe"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="bottom"

                    android:layout_marginBottom="12dp"

                    android:text="@string/button_confirm_convert_fbe" />

        </LinearLayout>



</LinearLayout>

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -7259,4 +7259,9 @@ 
    <!-- [CHAR_LIMIT=60] Label for special access screen -->

    <string name="special_access">Special access</string>









    <!-- Developer option to convert to file encryption - final warning -->









    <string name="confirm_convert_to_fbe_warning">Really wipe user data and convert to file encryption?</string>









    <!-- Developer option to convert to file encryption - final button -->









    <string name="button_confirm_convert_fbe">Wipe and convert</string>

















</resources>

























src/com/android/settings/applications/ConfirmConvertToFbe.java
0 → 100644



+48
−0






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2016 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */









package com.android.settings.applications;



















import android.app.Fragment;









import android.content.Intent;









import android.os.Bundle;









import android.view.LayoutInflater;









import android.view.View;









import android.view.ViewGroup;









import android.widget.Button;



















import com.android.settings.R;



















public class ConfirmConvertToFbe extends Fragment {









    static final String TAG = "ConfirmConvertToFBE";



















    @Override









    public View onCreateView(LayoutInflater inflater, ViewGroup container,









                Bundle savedInstanceState) {









        View rootView = inflater.inflate(R.layout.confirm_convert_fbe, null);



















        final Button button = (Button) rootView.findViewById(R.id.button_confirm_convert_fbe);









        button.setOnClickListener(new View.OnClickListener() {









            public void onClick(View v) {









                Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);









                intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);









                intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");









                getActivity().sendBroadcast(intent);









            }









        });



















        return rootView;









    }









}
























src/com/android/settings/applications/ConvertToFbe.java



+5
−5






























Original line number
Diff line number
Diff line







@@ -17,8 +17,8 @@ package com.android.settings.applications;

















import android.app.Activity;









import android.app.Fragment;









import android.content.Intent;









import android.content.res.Resources;









import android.content.Intent;









import android.os.Bundle;









import android.os.RecoverySystem;









import android.util.Log;








@@ -27,6 +27,7 @@ import android.view.View;







import android.view.ViewGroup;









import android.widget.Button;



















import com.android.settings.applications.ConfirmConvertToFbe;









import com.android.settings.ChooseLockSettingsHelper;









import com.android.settings.SettingsActivity;









import com.android.settings.R;








@@ -80,9 +81,8 @@ public class ConvertToFbe extends Fragment {







    }



















    private void convert() {









        Intent intent = new Intent(Intent.ACTION_MASTER_CLEAR);









        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);









        intent.putExtra(Intent.EXTRA_REASON, "convert_fbe");









        getActivity().sendBroadcast(intent);









        SettingsActivity sa = (SettingsActivity) getActivity();









        sa.startPreferencePanel(ConfirmConvertToFbe.class.getName(), null,









                                R.string.convert_to_file_encryption, null, null, 0);









    }









}