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

Merge "Revert "Make verifier device id information visible"" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-05-08 16:54:58 -07:00
committed by Android (Google) Code Review
parent e647fc6248 2f926bbb00
commit 267d43e6b7
3 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2768,12 +2768,6 @@
<string name="enable_adb">USB debugging</string> <string name="enable_adb">USB debugging</string>
<!-- Setting checkbox summary for Whether to enable USB debugging support on the phone --> <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
<string name="enable_adb_summary">Debug mode when USB is connected</string> <string name="enable_adb_summary">Debug mode when USB is connected</string>
<!-- Development settings: title for the field that shows the "App ID" development identifier
for this device. [CHAR LIMIT=40] -->
<string name="verifier_device_identifier">Development device ID</string>
<!-- Development settings: a string to show when the "App ID" development identifier for this
device cannot be read from internal settings. [CHAR LIMIT=60] -->
<string name="verifier_device_identifier_not_available">Device information not available</string>
<!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source --> <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
<string name="keep_screen_on">Stay awake</string> <string name="keep_screen_on">Stay awake</string>
<!-- setting Checkbox summary whether to keep the screen on when plugged in --> <!-- setting Checkbox summary whether to keep the screen on when plugged in -->

8
res/xml/development_prefs.xml
View File

@@ -16,14 +16,6 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/development_settings_title"> android:title="@string/development_settings_title">
<Preference
android:key="verifier_device_identifier"
style="?android:attr/preferenceInformationStyle"
android:title="@string/verifier_device_identifier"
android:summary="@string/verifier_device_identifier_not_available"
android:persistent="false" />
<PreferenceScreen <PreferenceScreen
android:key="local_backup_password" android:key="local_backup_password"
android:title="@string/local_backup_password_title" android:title="@string/local_backup_password_title"

10
src/com/android/settings/DevelopmentSettings.java
View File

@@ -30,7 +30,6 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.VerifierDeviceIdentity;
import android.os.BatteryManager; import android.os.BatteryManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -63,8 +62,6 @@ public class DevelopmentSettings extends PreferenceFragment
OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener { OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
private static final String ENABLE_ADB = "enable_adb"; private static final String ENABLE_ADB = "enable_adb";
private static final String VERIFIER_DEVICE_IDENTIFIER = "verifier_device_identifier";
private static final String KEEP_SCREEN_ON = "keep_screen_on"; private static final String KEEP_SCREEN_ON = "keep_screen_on";
private static final String ALLOW_MOCK_LOCATION = "allow_mock_location"; private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
private static final String HDCP_CHECKING_KEY = "hdcp_checking"; private static final String HDCP_CHECKING_KEY = "hdcp_checking";
@@ -191,13 +188,6 @@ public class DevelopmentSettings extends PreferenceFragment
mAllPrefs.add(mShowAllANRs); mAllPrefs.add(mShowAllANRs);
mResetCbPrefs.add(mShowAllANRs); mResetCbPrefs.add(mShowAllANRs);
final Preference verifierDeviceIdentifier = findPreference(VERIFIER_DEVICE_IDENTIFIER);
final PackageManager pm = getActivity().getPackageManager();
final VerifierDeviceIdentity verifierIndentity = pm.getVerifierDeviceIdentity();
if (verifierIndentity != null) {
verifierDeviceIdentifier.setSummary(verifierIndentity.toString());
}
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY); Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) { if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking); mAllPrefs.add(hdcpChecking);