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

Commit 922a11f6 authored by Eric Biggers's avatar Eric Biggers
Browse files

Remove CryptKeeperSettings 

FDE support has been removed in favor of FBE, so remove the FDE settings
from the "Encryption & credentials" page of the Settings app.

For now I didn't change the way the page appears on devices that don't
use FDE; as before, it still lists "Encrypt phone", followed by either
"Encrypted" or "Phone not encrypted" with no changeable settings.  Note
that the strings used for this have "crypt_keeper" in their names but
aren't specific to FDE; the next CL will rename them.

Test: On Cuttlefish with and without encryption enabled, tested visiting
      the "Encryption & credentials" settings.
Bug: 208476087
Change-Id: I3ce9894291ea1f1886f21980a86a92bfce38038a
(cherry picked from commit 36609c18)
Merged-In: I3ce9894291ea1f1886f21980a86a92bfce38038a
parent 438c3af0

AndroidManifest.xml

+0 −20
Original line number Diff line number Diff line
@@ -2849,26 +2849,6 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".CryptKeeperConfirm$Blank"

            android:immersive="true"

            android:launchMode="singleTop"

            android:theme="@style/CryptKeeperBlankTheme"

        />



        <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->

        <activity android:name="Settings$CryptKeeperSettingsActivity"

                android:exported="true"

                android:label="@string/crypt_keeper_encrypt_title">

            <intent-filter android:priority="1">

                <action android:name="android.app.action.START_ENCRYPTION" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.security.CryptKeeperSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                       android:value="@string/menu_key_security"/>

        </activity>



        <activity

            android:name="Settings$DataUsageSummaryActivity"

            android:label="@string/data_usage_summary_title"

res/drawable-hdpi/encroid_progress.png

deleted100644 → 0
−23.4 KiB
Loading image diff...

res/drawable-mdpi/encroid_progress.png

deleted100644 → 0
−13.8 KiB
Loading image diff...

res/drawable-xhdpi/encroid_progress.png

deleted100644 → 0
−35 KiB
Loading image diff...

res/layout/crypt_keeper_blank.xml

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

<!-- Copyright (C) 2011 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:gravity="center_vertical"

>



    <ImageView

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:src="@drawable/encroid_progress"

        android:contentDescription="@null"

    />



</LinearLayout>