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

Merge "Fix bad string reference" into oc-mr1-dev

Browse Source 
am: f4716e89c0

Change-Id: I8f0a632761f30aff990dad51cff99f0a7907b94c
This commit is contained in:
Maurice Lam
2017-08-17 01:21:10 +00:00
committed by android-build-merger
parent 5c15a79fa4 f4716e89c0
commit f7a818345d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/choose_lock_password.xml
View File

@@ -21,7 +21,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:icon="@drawable/ic_lock" android:icon="@drawable/ic_lock"
settings:suwFooter="@layout/choose_lock_password_footer" settings:suwFooter="@layout/choose_lock_password_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_password_header"> settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">
<LinearLayout <LinearLayout
style="@style/SuwContentFrame" style="@style/SuwContentFrame"

2
src/com/android/settings/password/ChooseLockPassword.java
View File

@@ -162,7 +162,7 @@ public class ChooseLockPassword extends SettingsActivity {
.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false); .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
CharSequence msg = getText(forFingerprint CharSequence msg = getText(forFingerprint
? R.string.lockpassword_choose_your_password_header_for_fingerprint ? R.string.lockpassword_choose_your_password_header_for_fingerprint
: R.string.lockpassword_choose_your_password_header); : R.string.lockpassword_choose_your_screen_lock_header);
setTitle(msg); setTitle(msg);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent); LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false); layout.setFitsSystemWindows(false);