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

Commit 7000aa91 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev 

am: 17910325

* commit '17910325':
  Add a deletion helper view for clearing space.

Change-Id: If02b00b3e35e717508ae69894a36ac71a1c3c30f
parents 35c344af 17910325

AndroidManifest.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ 
    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />

    <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />

    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>

    <uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>

    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.DELETE_PACKAGES"/>





    <application android:label="@string/settings_label"

    <application android:label="@string/settings_label"

            android:icon="@mipmap/ic_launcher_settings"

            android:icon="@mipmap/ic_launcher_settings"

res/layout/app_item.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,14 @@ 
        android:textColor="?android:attr/textColorSecondary"

        android:textColor="?android:attr/textColorSecondary"

        android:duplicateParentState="true" />

        android:duplicateParentState="true" />





    <Switch

            android:id="@android:id/switch_widget"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentRight="true"

            android:background="@null"

            android:visibility="gone"/>



    <FrameLayout

    <FrameLayout

        android:id="@android:id/widget_frame"

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

res/menu/storage_volume.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -30,4 +30,7 @@ 
    <item

    <item

        android:id="@+id/storage_migrate"

        android:id="@+id/storage_migrate"

        android:title="@string/storage_menu_migrate" />

        android:title="@string/storage_menu_migrate" />

    <item

        android:id="@+id/storage_free"

        android:title="@string/storage_menu_free" />

</menu>
 
</menu>

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2441,6 +2441,8 @@ 
    <string name="storage_menu_set_up">Set up</string>

    <string name="storage_menu_set_up">Set up</string>

    <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->

    <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->

    <string name="storage_menu_explore">Explore</string>

    <string name="storage_menu_explore">Explore</string>

    <!-- Storage setting. Menu option for using the deletion helper. [CHAR LIMIT=30] -->

    <string name="storage_menu_free">Free up space</string>











    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->




    <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->








    <string name="storage_title_usb">USB computer connection</string>




    <string name="storage_title_usb">USB computer connection</string>
































res/xml/deletion_helper_list.xml
0 → 100644



+24
−0






























Original line number
Original line
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.










-->





















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










                  android:title="@string/deletion_helper_title">





















    <PreferenceCategory










            android:key="apps_group"










            android:title="@string/deletion_helper_apps_title" />





















</PreferenceScreen>