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

Commit 3ef52587 authored by Jim Miller's avatar Jim Miller
Browse files

resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev 

Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
parents 6b68b000 46c7f6d6

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,8 @@ 
        <activity android:name="ChooseLockPassword" android:exported="false"

            android:windowSoftInputMode="stateVisible|adjustResize"/>



        <activity android:name=".EncryptionInterstitial"/>



        <!-- Runs in the phone process since it needs access to the Phone object -->

        <activity android:name=".deviceinfo.Status"

                android:label="@string/device_status_activity_title"

res/layout/encryption_interstitial.xml

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



<!--

  ~ Copyright (C) 2014 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:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="@dimen/settings_side_margin"

        android:paddingEnd="@dimen/settings_side_margin">



    <TextView

            android:id="@+id/encryption_message"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"

            android:textAppearance="?android:attr/textAppearanceMedium" />



    <RadioGroup

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"

            android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"

            android:checkedButton="@+id/encrypt_require_password">



        <RadioButton

                android:id="@+id/encrypt_require_password"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp" />



        <RadioButton

                android:id="@+id/encrypt_dont_require_password"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp" />



    </RadioGroup>



</LinearLayout>

res/values/strings.xml

+28 −0
Original line number Diff line number Diff line
@@ -5913,4 +5913,32 @@ 
    <string name="imei_information_title">IMEI information</string>

    <!-- Description for IMEI preference [CHAR LIMIT=40] -->

    <string name="imei_information_summary">IMEI relative information</string>



    <!-- Encryption interstitial title [CHAR LIMIT=30] -->

    <string name="encryption_interstitial_header">Encryption</string>



    <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->

    <string name="encryption_continue_button">Continue</string>



    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_pin">Because your device is encrypted, you can further protect it by requiring that you enter your PIN before your device starts up.</string>

    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_pattern">Because your device is encrypted, you can further protect it by requiring that you enter your pattern before your device starts up.</string>

    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->

    <string name="encryption_interstitial_message_password">Because your device is encrypted, you can further protect it by requiring that you enter your password before your device starts up.</string>



    <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->

    <string name="encrypt_require_pin">Require PIN to start device</string>

    <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->

    <string name="encrypt_require_pattern">Require pattern to start device</string>

    <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->

    <string name="encrypt_require_password">Require password to start device</string>



    <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->

    <string name="encrypt_dont_require_pin">No thanks</string>

    <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->

    <string name="encrypt_dont_require_pattern">No thanks</string>

    <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->

    <string name="encrypt_dont_require_password">No thanks</string>



</resources>

src/com/android/settings/ChooseLockGeneric.java

+40 −5
Original line number Diff line number Diff line
@@ -18,12 +18,16 @@ package com.android.settings; 


import android.accessibilityservice.AccessibilityServiceInfo;

import android.app.Activity;

import android.app.ActivityManagerNative;

import android.app.PendingIntent;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.content.Intent;

import android.content.pm.UserInfo;

import android.os.Bundle;

import android.os.Process;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.Preference;

import android.preference.PreferenceScreen;
@@ -69,11 +73,14 @@ public class ChooseLockGeneric extends SettingsActivity { 
        private static final String KEY_UNLOCK_SET_PATTERN = "unlock_set_pattern";

        private static final int CONFIRM_EXISTING_REQUEST = 100;

        private static final int FALLBACK_REQUEST = 101;

        private static final int ENABLE_ENCRYPTION_REQUEST = 102;

        private static final String PASSWORD_CONFIRMED = "password_confirmed";

        private static final String CONFIRM_CREDENTIALS = "confirm_credentials";

        private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";

        private static final String FINISH_PENDING = "finish_pending";

        public static final String MINIMUM_QUALITY_KEY = "minimum_quality";

        public static final String ENCRYPT_REQUESTED_QUALITY = "encrypt_requested_quality";

        public static final String ENCRYPT_REQUESTED_DISABLED = "encrypt_requested_disabled";



        private static final boolean ALWAY_SHOW_TUTORIAL = true;
@@ -83,6 +90,8 @@ public class ChooseLockGeneric extends SettingsActivity { 
        private boolean mPasswordConfirmed = false;

        private boolean mWaitingForConfirmation = false;

        private boolean mFinishPending = false;

        private int mEncryptionRequestQuality;

        private boolean mEncryptionRequestDisabled;



        @Override

        public void onCreate(Bundle savedInstanceState) {
@@ -103,6 +112,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
                mPasswordConfirmed = savedInstanceState.getBoolean(PASSWORD_CONFIRMED);

                mWaitingForConfirmation = savedInstanceState.getBoolean(WAITING_FOR_CONFIRMATION);

                mFinishPending = savedInstanceState.getBoolean(FINISH_PENDING);

                mEncryptionRequestQuality = savedInstanceState.getInt(ENCRYPT_REQUESTED_QUALITY);

                mEncryptionRequestDisabled = savedInstanceState.getBoolean(

                        ENCRYPT_REQUESTED_DISABLED);

            }



            if (mPasswordConfirmed) {
@@ -143,16 +155,16 @@ public class ChooseLockGeneric extends SettingsActivity { 
                updateUnlockMethodAndFinish(

                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, false);

            } else if (KEY_UNLOCK_SET_BIOMETRIC_WEAK.equals(key)) {

                updateUnlockMethodAndFinish(

                maybeEnableEncryption(

                        DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK, false);

            }else if (KEY_UNLOCK_SET_PATTERN.equals(key)) {

                updateUnlockMethodAndFinish(

                maybeEnableEncryption(

                        DevicePolicyManager.PASSWORD_QUALITY_SOMETHING, false);

            } else if (KEY_UNLOCK_SET_PIN.equals(key)) {

                updateUnlockMethodAndFinish(

                maybeEnableEncryption(

                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, false);

            } else if (KEY_UNLOCK_SET_PASSWORD.equals(key)) {

                updateUnlockMethodAndFinish(

                maybeEnableEncryption(

                        DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC, false);

            } else {

                handled = false;
@@ -160,6 +172,24 @@ public class ChooseLockGeneric extends SettingsActivity { 
            return handled;

        }



        /**

         * If the device has encryption already enabled, then ask the user if they

         * also want to encrypt the phone with this password.

         *

         * @param quality

         * @param disabled

         */

        private void maybeEnableEncryption(int quality, boolean disabled) {

            if (Process.myUserHandle().isOwner() && LockPatternUtils.isDeviceEncryptionEnabled()) {

                mEncryptionRequestQuality = quality;

                mEncryptionRequestDisabled = disabled;

                Intent intent = EncryptionInterstitial.createStartIntent(getActivity(), quality);

                startActivityForResult(intent, ENABLE_ENCRYPTION_REQUEST);

            } else {

                updateUnlockMethodAndFinish(quality, disabled);

            }

        }



        @Override

        public View onCreateView(LayoutInflater inflater, ViewGroup container,

                Bundle savedInstanceState) {
@@ -186,6 +216,9 @@ public class ChooseLockGeneric extends SettingsActivity { 
                mChooseLockSettingsHelper.utils().deleteTempGallery();

                getActivity().setResult(resultCode);

                finish();

            } else if (requestCode == ENABLE_ENCRYPTION_REQUEST

                    && resultCode == Activity.RESULT_OK) {

                updateUnlockMethodAndFinish(mEncryptionRequestQuality, mEncryptionRequestDisabled);

            } else {

                getActivity().setResult(Activity.RESULT_CANCELED);

                finish();
@@ -199,6 +232,8 @@ public class ChooseLockGeneric extends SettingsActivity { 
            outState.putBoolean(PASSWORD_CONFIRMED, mPasswordConfirmed);

            outState.putBoolean(WAITING_FOR_CONFIRMATION, mWaitingForConfirmation);

            outState.putBoolean(FINISH_PENDING, mFinishPending);

            outState.putInt(ENCRYPT_REQUESTED_QUALITY, mEncryptionRequestQuality);

            outState.putBoolean(ENCRYPT_REQUESTED_DISABLED, mEncryptionRequestDisabled);

        }



        private void updatePreferencesOrFinish() {

src/com/android/settings/ChooseLockPassword.java

+2 −0
Original line number Diff line number Diff line
@@ -24,11 +24,13 @@ import com.android.settings.notification.RedactionInterstitial; 
import android.app.Activity;

import android.app.Fragment;

import android.app.admin.DevicePolicyManager;

import android.content.ContentResolver;

import android.content.Intent;

import android.inputmethodservice.KeyboardView;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;

import android.provider.Settings;

import android.text.Editable;

import android.text.InputType;

import android.text.Selection;