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 am: f4716e89c0

Browse Source 
am: f7a818345d

Change-Id: I3c9bb76c5c986d58e2b91ae25cdb2a7333d78249
This commit is contained in:
Maurice Lam
2017-08-17 07:13:41 +00:00
committed by android-build-merger
parent 7e5055b30c f7a818345d
commit a4b54e52ba
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:icon="@drawable/ic_lock"
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
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);
CharSequence msg = getText(forFingerprint
? 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);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);