PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2015-05-14 04:04:54 +00:00
committed by Android (Google) Code Review
parent b331c3937d 50e32b0db0
commit 0327d48306
6 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -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>

4
res/xml/development_prefs.xml
View File

@@ -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>

20
res/xml/inactive_apps.xml Normal file
View File

@@ -0,0 +1,20 @@
<?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>