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

Commit 0f82fe6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Delete Directory access Settings."

parents 16340ce5 57eb049b
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -2962,16 +2962,6 @@
                       android:value="true" />
        </activity>

        <activity android:name="Settings$DirectoryAccessSettingsActivity"
                android:label="@string/directory_access">
            <intent-filter>
                <action android:name="android.settings.STORAGE_VOLUME_ACCESS_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.applications.manageapplications.ManageApplications" />
        </activity>

        <provider android:name=".slices.SettingsSliceProvider"
                  android:authorities="com.android.settings.slices;android.settings.slices"
                  android:exported="true"
+0 −9
Original line number Diff line number Diff line
@@ -9964,15 +9964,6 @@
    <!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->
    <string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
    <!-- Title for Directory Access settings -->
    <string name="directory_access">Directory access</string>
    <!-- Keywords for Directory Access settings -->
    <string name="keywords_directory_access">directory access</string>
    <!-- String used to describe the name of a directory in a volume; it must
         show both names, with the directory name wrapped in parenthesis -->
    <string name="directory_on_volume"><xliff:g id="volume" example="SD Card">%1$s</xliff:g> (<xliff:g id="directory" example="Movies">%2$s</xliff:g>)</string>
    <!-- Slices Strings -->
    <!-- Summary text on a card explaining that a setting does not exist / is not supported on the device [CHAR_LIMIT=NONE]-->
+0 −20
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2018 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"
        xmlns:settings="http://schemas.android.com/apk/res-auto"
        android:key="directory_access_details"
        android:title="@string/directory_access"/>
+0 −10
Original line number Diff line number Diff line
@@ -120,16 +120,6 @@
            android:value="com.android.settings.Settings$VrListenersSettingsActivity" />
    </Preference>

    <Preference
        android:key="special_app_directory_access"
        android:title="@string/directory_access"
        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
        settings:keywords="@string/keywords_directory_access">
        <extra
            android:name="classname"
            android:value="com.android.settings.Settings$DirectoryAccessSettingsActivity" />
    </Preference>

    <Preference
        android:key="change_wifi_state"
        android:title="@string/change_wifi_state_title"
+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ public class Settings extends SettingsActivity {
    public static class PhotosStorageActivity extends SettingsActivity {
        /* empty */
    }
    public static class DirectoryAccessSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
    public static class WifiCallingSettingsActivity extends SettingsActivity { /* empty */ }
Loading