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

Commit aad643ca authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Remove the Deletion Helper and Automatic Storage Management jobs. 

The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.

Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
parent 672e1ddb

AndroidManifest.xml

+0 −26
Original line number Diff line number Diff line
@@ -2919,17 +2919,6 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$DeletionHelperActivity"

                  android:label="@string/deletion_helper_title"

                  android:taskAffinity="">

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

                <action android:name="android.settings.DELETION_HELPER_SETTINGS" />

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

            </intent-filter>

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

                       android:value="com.android.settings.deletionhelper.DeletionHelperFragment" />

        </activity>



        <!-- activity for gesture settings -->

        <activity android:name="Settings$GestureSettingsActivity"

                  android:label="@string/gesture_preference_title"
@@ -3008,21 +2997,6 @@ 
            </intent-filter>

        </service>



        <!-- Automatic storage management tasks. -->

        <service

            android:name=".deletionhelper.AutomaticStorageManagementJobService"

            android:label="@string/automatic_storage_manager_service_label"

            android:permission="android.permission.BIND_JOB_SERVICE"

            android:enabled="@bool/enable_automatic_storage_management"

            android:exported="false"/>



        <receiver android:name=".deletionhelper.AutomaticStorageBroadcastReceiver"

                  android:enabled="@bool/enable_automatic_storage_management">

            <intent-filter>

                <action android:name="android.intent.action.BOOT_COMPLETED" />

            </intent-filter>

        </receiver>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

res/drawable/ic_keyboard_arrow_down_black_32.xml

deleted100644 → 0
+0 −25
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.

-->

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

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

            android:fillColor="#FF000000"

            android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_keyboard_arrow_up_black_32.xml

deleted100644 → 0
+0 −25
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.

-->

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

        android:width="32dp"

        android:height="32dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

            android:fillColor="#FF000000"

            android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>

</vector>
 
 No newline at end of file

res/values/bools.xml

+2 −2
Original line number Diff line number Diff line
@@ -41,6 +41,6 @@ 
    <!-- Whether none security option is hide or not  (country specific). -->

    <bool name="config_hide_none_security_option">false</bool>



    <!-- Whether the automatic storage management job should be scheduled. -->

    <bool name="enable_automatic_storage_management">false</bool>

    <!--Whether the storage manager exists. -->

    <bool name="config_has_storage_manager">false</bool>

</resources>

res/values/strings.xml

+0 −53
Original line number Diff line number Diff line
@@ -7493,17 +7493,6 @@ 
    <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->

    <string name="demo_mode">Demo mode</string>









    <!-- Activity title for deletion helper. [CHAR LIMIT=25] -->









    <string name="deletion_helper_title">Remove from Device</string>









    <!-- Summary of how much storage an app is using and the number of days since last use. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_app_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Last used <xliff:g id="days" example="67">%2$d</xliff:g> days ago</string>









    <!-- Summary of how much storage an app is using when it has never been used before. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_app_summary_never_used"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Never used before</string>









    <!-- Summary of how much storage an app is using when its last use is unknown. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_app_summary_unknown_used"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Not sure when last used</string>









    <!-- Button which clears out storage in the deletion helper. [CHAR LIMIT=60]-->









    <string name="deletion_helper_free_button">Free up <xliff:g id="freeable" example="1.2GB">%1$s</xliff:g></string>

















    <!-- Title text for connecting to customer support [CHAR LIMIT=80]-->









    <string name="support_escalation_title">Around-the-clock support</string>
















@@ -7598,27 +7587,6 @@







    <!-- Message for telling the user the kind of BT device being displayed in list. -->









    <string name="bluetooth_talkback_bluetooth">Bluetooth</string>

















    <!-- Preference group title for the photos and videos deletion service. [CHAR LIMIT=40]-->









    <string name="deletion_helper_photos_title">Photos &amp; Videos (<xliff:g id="num_items">%1$d</xliff:g>)</string>

















    <!-- Summary of how much backed up storage that photos and videos service can clear from the local device. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_photos_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Older than <xliff:g id="days">%2$d</xliff:g> days</string>

















    <!-- Preference title for the downloads deletion service. [CHAR LIMIT=40]-->









    <string name="deletion_helper_downloads_title">Downloads (<xliff:g id="numItems" example="67">%1$d</xliff:g>)</string>

















    <!-- Summary of how much stale data can be cleared from the local download folder. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_downloads_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Last modified <xliff:g id="days">%2$s</xliff:g></string>

















    <!-- Summary for when when there is nothing in the downloads folder to clear. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_downloads_summary_empty"><xliff:g id="used" example="1.2GB">%1$s</xliff:g></string>

















    <!-- Message to warn the user before clearing space in the deletion helper. [CHAR LIMIT=NONE] -->









    <string name="deletion_helper_clear_dialog_message">Remove <xliff:g id="clearable_bytes" example="1.2GB">%1$s</xliff:g> from your device.</string>

















    <!-- Button label for the dialog prompt for clearing data in deletion helper. [CHAR LIMIT=40] -->









    <string name="deletion_helper_clear_dialog_remove">Remove</string>

















    <!-- Used as title on the automatic storage manager settings. [CHAR LIMIT=60] -->









    <string name="automatic_storage_manager_settings">Storage manager</string>
















@@ -7628,21 +7596,6 @@







    <!-- Dropdown preference title for dropdown describing how many days of data to retain.-->









    <string name="automatic_storage_manager_days_title">Remove photos &amp; videos</string>

















    <!-- Title for the dialog to up sell the storage manager. [CHAR LIMIT=NONE] -->









    <string name="deletion_helper_upsell_title"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> now free. Manage storage automatically?</string>









    <!-- Summary for the dialog to up sell the storage manager. [CHAR LIMIT=NONE] -->









    <string name="deletion_helper_upsell_summary">Let Storage manager automatically free up space by removing backed up content from your device?</string>









    <!-- Button to delay turning on the storage manager on the storage manager upsell. [CHAR LIMIT=20]-->









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









    <!-- Button to activate the storage manager on the storage manager upsell. [CHAR LIMIT=20]-->









    <string name="deletion_helper_upsell_activate">Turn on</string>

















    <!-- Title for the apps category in the deletion helper, showing how many apps to delete. [CHAR LIMIT=40]-->









    <string name="deletion_helper_apps_group_title">Apps (<xliff:g id="num_items">%1$d</xliff:g>)</string>

















    <!-- Summary for the apps category in the deletion helper, showing how many space to clear. [CHAR LIMIT=NONE]-->









    <string name="deletion_helper_apps_group_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> • Last used <xliff:g id="days">%2$d</xliff:g> days ago</string>

















    <!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->









    <string name="deletion_helper_automatic_title">Automatic</string>
















@@ -7652,12 +7605,6 @@







    <!-- Preference menu title for accessing the deletion helper from the storage manager settings. [CHAR LIMIT=30]-->









    <string name="deletion_helper_preference_title">Free space now</string>

















    <!-- Preference title for the automatic storage manager toggle. [CHAR LIMIT=60]-->









    <string name="automatic_storage_manager_preference_title">Storage manager</string>

















    <!-- Automatic storage management service label. [CHAR LIMIT=40]-->









    <string name="automatic_storage_manager_service_label">Automatic Storage Management Service</string>

















    <!-- Preference title for gesture settings [CHAR LIMIT=25]-->









    <string name="gesture_preference_title">Gestures</string>