diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-26 14:37:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-26 14:37:30 -0700 |
| commit | 885ac7701fc809276aed1be151b9ecd8bd0a1cd3 (patch) | |
| tree | fd7b38d09424edbb1c273badf5c365eb3a9ce8ec /src/com/android/settings | |
| parent | 2e8bf1aa8291f8b0523b052d94cf1fcd6bf65cc7 (diff) | |
| parent | 46c0a5b12973fcd40b72b48fe344e45f1110865e (diff) | |
| download | packages_apps_Settings-885ac7701fc809276aed1be151b9ecd8bd0a1cd3.zip packages_apps_Settings-885ac7701fc809276aed1be151b9ecd8bd0a1cd3.tar.gz packages_apps_Settings-885ac7701fc809276aed1be151b9ecd8bd0a1cd3.tar.bz2 | |
am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp
* commit '46c0a5b12973fcd40b72b48fe344e45f1110865e':
Remove unused imports in SecuritySettings.java
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 5 | ||||
| -rw-r--r-- | src/com/android/settings/SoundSettings.java | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 05a655a..5ebc1f1 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -20,7 +20,6 @@ package com.android.settings; import java.util.Observable; import java.util.Observer; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -32,20 +31,16 @@ import android.content.Intent; import android.database.Cursor; import android.location.LocationManager; import android.os.Bundle; -import android.os.SystemProperties; import android.preference.CheckBoxPreference; -import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceActivity; import android.preference.PreferenceCategory; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; -import android.preference.Preference.OnPreferenceChangeListener; import android.provider.Settings; import android.security.Credentials; import android.security.KeyStore; import android.telephony.TelephonyManager; -import android.util.Log; import android.view.View; import android.widget.TextView; import android.widget.Toast; diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index bfb5566..a735268 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -16,8 +16,6 @@ package com.android.settings; -import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; - import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; |