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

Merge "Show 'screen lock options' on all lock screen types"

Browse Source
This commit is contained in:
Ajay Nadathur
2018-01-05 21:19:14 +00:00
committed by Android (Google) Code Review
parent 6ee11a6178 a1314df69c
commit a63075f0eb
9 changed files with 106 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/choose_lock_password_footer.xml
View File

@@ -21,12 +21,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
<!-- left : skip -->
<Button android:id="@+id/skip_button"
style="@style/SuwGlifButton.Secondary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
android:text="@string/skip_label"
android:visibility="gone" />
<!-- left : clear -->

8
res/layout/choose_lock_pattern_common.xml
View File

@@ -107,6 +107,14 @@
android:textSize="14sp"
android:visibility="gone"/>
<Button
android:id="@+id/screen_lock_options"
style="@style/SuwGlifButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/setup_lock_settings_options_button_label"
android:visibility="gone" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>