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

Commit 0327d483 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Developer settings screen for inactive apps" into mnc-dev

parents b331c393 50e32b0d

AndroidManifest.xml

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

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

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

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



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

            android:icon="@mipmap/ic_launcher_settings"

res/values/strings.xml

+7 −1
Original line number Diff line number Diff line
@@ -3537,7 +3537,6 @@ 
    <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->

    <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</string>





    <!-- UI debug setting: limit size of Android logger buffers -->

    <string name="select_logd_size_title">Logger buffer sizes</string>

    <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
@@ -6628,4 +6627,11 @@ 
         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->

    <string name="usb_use">Use USB for</string>



    <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->

    <string name="inactive_apps_title">Inactive apps</string>

    <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->

    <string name="inactive_app_inactive_summary">Inactive. Touch to toggle.</string>

    <!-- Settings item summary for active app [CHAR LIMIT=100] -->

    <string name="inactive_app_active_summary">Active. Touch to toggle.</string>



</resources>

res/xml/development_prefs.xml

+4 −0
Original line number Diff line number Diff line
@@ -341,6 +341,10 @@ 
            android:title="@string/show_all_anrs"

            android:summary="@string/show_all_anrs_summary"/>



        <Preference

                android:key="inactive_apps"

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



     </PreferenceCategory>



</PreferenceScreen>

res/xml/inactive_apps.xml

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

<!-- Copyright (C) 2015 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">



</PreferenceScreen>

src/com/android/settings/DevelopmentSettings.java

+12 −0
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ import android.widget.Switch; 
import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.fuelgauge.InactiveApps;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.users.UserDetailsSettings;

import com.android.settings.widget.SwitchBar;



import java.lang.Process;
@@ -165,6 +167,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private static final String WIFI_LEGACY_DHCP_CLIENT_KEY = "legacy_dhcp_client";

    private static final String MOBILE_DATA_ALWAYS_ON = "mobile_data_always_on";



    private static final String INACTIVE_APPS_KEY = "inactive_apps";



    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";



    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -1728,6 +1732,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
            writeUseAwesomePlayerOptions();

        } else if (preference == mUSBAudio) {

            writeUSBAudioOptions();

        } else if (INACTIVE_APPS_KEY.equals(preference.getKey())) {

            startInactiveAppsFragment();

        } else {

            return super.onPreferenceTreeClick(preferenceScreen, preference);

        }
@@ -1735,6 +1741,12 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        return false;

    }



    private void startInactiveAppsFragment() {

        ((SettingsActivity) getActivity()).startPreferencePanel(

                InactiveApps.class.getName(),

                null, R.string.inactive_apps_title, null, null, 0);

    }



    private boolean showKeyguardConfirmation(Resources resources, int requestCode) {

        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(

                requestCode, resources.getString(R.string.oem_unlock_enable));