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

Commit 1f4049ed authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Ask about redacted notifications after setting up a secure lock" into lmp-dev

parents 802ddf99 6f60f7ed

AndroidManifest.xml

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

        </activity>



        <activity android:name=".notification.RedactionInterstitial" />



        <activity android:name="ConfirmLockPattern"/>

res/layout/redaction_interstitial.xml

0 → 100644
+66 −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: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:text="@string/lock_screen_notifications_interstitial_message"

            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/redact_sensitive">



        <RadioButton

                android:id="@+id/show_all"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

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



        <RadioButton

                android:id="@+id/redact_sensitive"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

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



        <RadioButton

                android:id="@+id/hide_all"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginTop="16dp"

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



    </RadioGroup>



</LinearLayout>
 
 No newline at end of file

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -5642,6 +5642,9 @@ 
         [CHAR LIMIT=50] -->

    <string name="lock_screen_notifications_summary_disable">Don\'t show notifications at all</string>



    <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->

    <string name="lock_screen_notifications_interstitial_message">When your device is locked, how do you want notifications to show?</string>



    <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->

    <string name="app_notifications_title">App notifications</string>

src/com/android/settings/ChooseLockPassword.java

+2 −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.notification.RedactionInterstitial;



import android.app.Activity;

import android.app.Fragment;
@@ -408,6 +409,7 @@ public class ChooseLockPassword extends SettingsActivity { 
                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);

                    getActivity().setResult(RESULT_FINISHED);

                    getActivity().finish();

                    startActivity(RedactionInterstitial.createStartIntent(getActivity()));

                } else {

                    CharSequence tmp = mPasswordEntry.getText();

                    if (tmp != null) {

src/com/android/settings/ChooseLockPattern.java

+2 −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.notification.RedactionInterstitial;



import static com.android.internal.widget.LockPatternView.DisplayMode;
@@ -532,6 +533,7 @@ public class ChooseLockPattern extends SettingsActivity { 


            getActivity().setResult(RESULT_FINISHED);

            getActivity().finish();

            startActivity(RedactionInterstitial.createStartIntent(getActivity()));

        }

    }

}