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

Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e

Browse Source 
am: 47e38646ed

Change-Id: If8a44dee9ba11281c9cc62b16b3599655c94724a
This commit is contained in:
Maurice Lam
2016-06-17 18:54:51 +00:00
committed by android-build-merger
parent 56bcc06b1e 47e38646ed
commit f438a1a423
26 changed files with 345 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
res/layout/choose_lock_password.xml
View File

@@ -1,79 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
**
** Copyright 2008, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License")
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License")
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:gravity="center_horizontal">
<!-- header text ('Enter Pin') -->
<TextView android:id="@+id/headerText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:lines="2"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="30dip"
android:layout_marginEnd="30dip"
android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"
/>
<!-- Spacer between password entry and keyboard -->
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal">
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- header text ('Enter Pin') -->
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:lines="2"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="end"
android:orientation="horizontal">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_continue_label" />
</LinearLayout>
<!-- Spacer between password entry and keyboard -->
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"/>
</LinearLayout>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"
/>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>

78
res/layout/choose_lock_pattern.xml
View File

@@ -1,78 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/topLayout"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<!-- takes up all space above button bar at bottom -->
<com.android.settings.widget.MatchParentShrinkingLinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:minLines="2"
android:gravity="center"
android:textSize="18sp" />
<View
android:background="@*android:drawable/code_lock_top"
android:layout_width="match_parent"
android:layout_height="2dip" />
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- bottom line looks bad when button bar is their too, omit in this case -->
<!--View
android:background="@*android:drawable/code_lock_bottom"
android:layout_width="match_parent"
android:layout_height="8dip" /-->
<TextView android:id="@+id/footerText"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:gravity="center"
android:textSize="14sp"/>
</com.android.settings.widget.MatchParentShrinkingLinearLayout>
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal">
<!-- left : cancel, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_cancel_label"/>
<!-- right : confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_tutorial_continue_label"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

0
res/layout/setup_choose_lock_pattern_common.xml → res/layout/choose_lock_pattern_common.xml
View File

7
res/layout/encryption_interstitial_header.xml
View File

@@ -20,8 +20,9 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="56dp"
android:paddingTop="16dp"
android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="16dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:paddingTop="@dimen/suw_description_glif_margin_top"
android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="?android:attr/textAppearanceListItem" />

132
res/layout/redaction_interstitial.xml
View File

@@ -1,77 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2014 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
Copyright (C) 2015 The Android Open Source Project
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="?attr/side_margin"
android:paddingEnd="?attr/side_margin">
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
<TextView
android:id="@+id/message"
<LinearLayout
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lock_screen_notifications_interstitial_message"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_height="match_parent"
android:orientation="vertical">
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:checkedButton="@+id/redact_sensitive">
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
<TextView
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_show" />
android:text="@string/lock_screen_notifications_interstitial_message" />
<com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive"
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_hide" />
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:checkedButton="@+id/redact_sensitive">
<RadioButton
android:id="@+id/hide_all"
android:layout_width="match_parent"
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_show" />
<com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_hide" />
<RadioButton
android:id="@+id/hide_all"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_disable" />
<!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
<com.android.settings.RestrictedCheckBox
android:id="@+id/lockscreen_remote_input"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lockscreen_remote_input" />
</RadioGroup>
<Button
android:id="@+id/redaction_done_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:text="@string/lock_screen_notifications_summary_disable" />
android:layout_gravity="end"
android:text="@string/app_notifications_dialog_done" />
</RadioGroup>
</LinearLayout>
<com.android.settings.RestrictedCheckBox
android:id="@+id/lockscreen_remote_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/RedactionItemAndLabel"
android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:text="@string/lockscreen_remote_input" />
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>

97
res/layout/setup_choose_lock_password.xml
View File

@@ -1,97 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License")
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lockpassword_choose_your_password_header">
<LinearLayout
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<!-- header text ('Enter Pin') -->
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:lines="2"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:gravity="end"
android:orientation="horizontal">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_cancel_label" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpassword_continue_label" />
</LinearLayout>
<!-- Spacer between password entry and keyboard -->
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"/>
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>

89
res/layout/setup_redaction_interstitial.xml
View File

@@ -1,89 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License
-->
<com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lock_screen_notifications_interstitial_title">
<LinearLayout
style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
style="@style/SuwDescription.Glif"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_interstitial_message" />
<RadioGroup
android:id="@+id/radio_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:checkedButton="@+id/redact_sensitive">
<com.android.settings.RestrictedRadioButton
android:id="@+id/show_all"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_show" />
<com.android.settings.RestrictedRadioButton
android:id="@+id/redact_sensitive"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_hide" />
<RadioButton
android:id="@+id/hide_all"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lock_screen_notifications_summary_disable" />
<!-- Place the checkbox inside RadioGroup and use SuwRadioButton style instead of
SuwCheckBox style so that the checkbox and text is aligned with radio buttons. -->
<com.android.settings.RestrictedCheckBox
android:id="@+id/lockscreen_remote_input"
style="@style/SuwRadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/redaction_vertical_margins"
android:text="@string/lockscreen_remote_input" />
</RadioGroup>
<Button
android:id="@+id/redaction_next_button"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/next_label" />
</LinearLayout>
</com.android.setupwizardlib.GlifLayout>