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

Commit eac18077 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Remove GrandfatheredModernStorageGroupWarningDialog 

This dialog is not needed anymore in Storage Permission Model 3.

Test: Built
Bug: 129716569
Change-Id: I57c094a9cab5ea4dd3d6b64dd7d2ac3f25789f02
parent 35c8b8d9

res/drawable/ic_warning.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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.

  -->



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

        android:width="36dp"

        android:height="36dp"

        android:viewportWidth="36.0"

        android:viewportHeight="36.0"

        android:tint="?android:attr/colorControlNormal">

    <path android:pathData="M1,32h34L18,3 1,32zM19,27h-2v-2h2v2zM19,22h-2v-7h2v7z"

          android:fillColor="#000000" />

</vector>
 
 No newline at end of file

res/layout/dialog_header.xml

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2019 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"

              style="@style/GrandfatheredModernStorageGroupWarningDialogHeader" >



    <ImageView android:id="@+id/icon"

               style="@style/GrandfatheredModernStorageGroupWarningDialogTitleIcon" />



    <TextView

        android:id="@+id/title"

        style="@style/GrandfatheredModernStorageGroupWarningDialogTitleMessage"  />



</LinearLayout>

res/values/overlayable.xml

+0 −7
Original line number Diff line number Diff line
@@ -121,13 +121,6 @@ 
            <item type="style" name="LoadingContainerTextView" />

            <!-- END LOADING CONTAINER -->



            <!-- START GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG -->

            <item type="style" name="GrandfatheredModernStorageGroupWarningDialogHeader" />



            <item type="style" name="GrandfatheredModernStorageGroupWarningDialogTitleIcon" />

            <item type="style" name="GrandfatheredModernStorageGroupWarningDialogTitleMessage" />

            <!-- END GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG -->



            <!-- START ONGOING USAGE DIALOG -->

            <item type="style" name="PermissionUsageDialogContainerScrollView" />

            <item type="style" name="PermissionUsageDialogContainerLayout" />

res/values/strings.xml

+0 −10
Original line number Diff line number Diff line
@@ -797,16 +797,6 @@ Allow <xliff:g id="app_name" example="Gmail">%4$s</xliff:g> to upload a bug repo 
    <!-- Label for the button to NOT allow sharing of the report. [CHAR LIMIT=20] -->

    <string name="incident_report_dialog_deny_label">Deny</string>



    <!-- Title for the warning dialog shown when user tried to revoke a grandfathered modern storage permission.

    [CHAR LIMIT=100] -->

    <string name="grandfathered_modern_storage_permission_deny_warning_title">Permission can\u2019t be denied. Uninstall <xliff:g id="app_name" example="Gmail">%1$s</xliff:g>.</string>



    <!-- Content for the warning dialog shown when user tried to revoke a grandfathered modern storage permission [CHAR LIMIT=none] -->

    <string name="grandfathered_modern_storage_permission_deny_warning_content"><xliff:g id="app_name" example="Gmail">%1$s</xliff:g> has legacy storage permission to keep your previous data accessible, and the app can stop working when this permission is denied.\n\nTo continue using the app, uninstall it and then reinstall it. Your data in this app may be lost.</string>



    <!-- Dismiss with acknowledgment [CHAR LIMIT=30] -->

    <string name="dismiss_with_acknowledgment">Got it</string>



    <!-- Label for screen allowing the user to force certain apps to always be shown in permission controller settings ui instead of being hidden behind "system app" menu. [CHAR LIMIT=60] -->

    <string name="adjust_user_sensitive_title">Advanced settings</string>

res/values/styles.xml

+0 −28
Original line number Diff line number Diff line
@@ -518,34 +518,6 @@ 


    <!-- END LOADING CONTAINER -->



    <!-- START GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG -->



    <style name="GrandfatheredModernStorageGroupWarningDialogHeader">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:orientation">vertical</item>

        <item name="android:gravity">center</item>

        <item name="android:paddingTop">16dp</item>

        <item name="android:paddingStart">24dp</item>

        <item name="android:paddingEnd">24dp</item>

    </style>



    <style name="GrandfatheredModernStorageGroupWarningDialogTitleIcon">

        <item name="android:layout_width">24dp</item>

        <item name="android:layout_height">24dp</item>

        <item name="android:layout_marginBottom">12dp</item>

        <item name="android:scaleType">fitCenter</item>

    </style>



    <style name="GrandfatheredModernStorageGroupWarningDialogTitleMessage"

           parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:gravity">center</item>

    </style>



    <!-- END GRANDFATHERED MODERN STORAGE GROUP WARNING DIALOG -->



    <!-- START ONGOING USAGE DIALOG -->



    <style name="PermissionUsageDialogContainerScrollView">