Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
A
android_packages_apps_Settings
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
e
os
android_packages_apps_Settings
Commits
8a868f2b
Commit
8a868f2b
authored
Mar 16, 2016
by
Jason Monk
Committed by
The Android Automerger
Mar 17, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use animations for security settings
Bug: 27419463 Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2
parent
8f5fd19f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
SecuritySettings.java
src/com/android/settings/SecuritySettings.java
+8
-4
No files found.
src/com/android/settings/SecuritySettings.java
View file @
8a868f2b
...
...
@@ -29,7 +29,6 @@ import android.content.DialogInterface;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
import
android.content.pm.ResolveInfo
;
import
android.content.pm.UserInfo
;
import
android.content.res.Resources
;
import
android.hardware.fingerprint.FingerprintManager
;
import
android.os.Bundle
;
...
...
@@ -53,10 +52,8 @@ import android.telephony.SubscriptionManager;
import
android.telephony.TelephonyManager
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
com.android.internal.logging.MetricsProto.MetricsEvent
;
import
com.android.internal.widget.LockPatternUtils
;
import
com.android.settings.TimeoutListPreference
;
import
com.android.settings.TrustAgentUtils.TrustAgentComponentInfo
;
import
com.android.settings.fingerprint.FingerprintSettings
;
import
com.android.settings.search.BaseSearchIndexProvider
;
...
...
@@ -71,7 +68,6 @@ import java.util.ArrayList;
import
java.util.List
;
import
static
android
.
provider
.
Settings
.
System
.
SCREEN_OFF_TIMEOUT
;
import
static
com
.
android
.
settingslib
.
RestrictedLockUtils
.
EnforcedAdmin
;
/**
...
...
@@ -212,6 +208,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
return
resid
;
}
@Override
public
void
setPreferenceScreen
(
PreferenceScreen
preferenceScreen
)
{
if
(!
preferenceScreen
.
isAttached
())
{
preferenceScreen
.
setShouldUseGeneratedIds
(
false
);
}
super
.
setPreferenceScreen
(
preferenceScreen
);
}
/**
* Important!
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment