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

Browse Source
This commit is contained in:
Maurice Lam
2016-06-16 22:00:20 +00:00
committed by Android (Google) Code Review
parent 75778049ba d189ac52a4
commit 223d45ea0e
26 changed files with 345 additions and 1140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
AndroidManifest.xml
View File

@@ -1594,7 +1594,8 @@
android:resource="@string/notification_suggestion_summary" /> android:resource="@string/notification_suggestion_summary" />
</activity> </activity>
<activity android:name=".notification.RedactionInterstitial"/> <activity android:name=".notification.RedactionInterstitial"
android:theme="@style/SetupWizardTheme.Light" />
<activity android:name=".notification.RedactionSettingsStandalone" <activity android:name=".notification.RedactionSettingsStandalone"
android:exported="true"> android:exported="true">
@@ -1641,7 +1642,7 @@
<activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction" <activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_FINGERPRINT" android:permission="android.permission.MANAGE_FINGERPRINT"
android:theme="@style/SetupWizardDisableAppStartingTheme"> android:theme="@style/SetupWizardTheme.Light">
<intent-filter> <intent-filter>
<action android:name="android.settings.FINGERPRINT_SETUP" /> <action android:name="android.settings.FINGERPRINT_SETUP" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@@ -1661,7 +1662,7 @@
<activity android:name="SetupChooseLockGeneric" <activity android:name="SetupChooseLockGeneric"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" android:theme="@style/SetupWizardTheme.Light"
android:label="@string/lock_settings_picker_title"> android:label="@string/lock_settings_picker_title">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="com.android.settings.SETUP_LOCK_SCREEN" /> <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1719,25 +1720,30 @@
<activity android:name="SetupChooseLockPattern" <activity android:name="SetupChooseLockPattern"
android:exported="false" android:exported="false"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" /> android:theme="@style/SetupWizardTheme.Light" />
<activity android:name="ChooseLockPattern" android:exported="false"/> <activity android:name="ChooseLockPattern"
android:exported="false"
android:theme="@style/SetupWizardTheme.Light" />
<activity android:name="SetupChooseLockPassword" <activity android:name="SetupChooseLockPassword"
android:exported="false" android:exported="false"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" android:theme="@style/SetupWizardTheme.Light"
android:windowSoftInputMode="stateVisible|adjustResize" /> android:windowSoftInputMode="stateVisible|adjustResize" />
<activity android:name="ChooseLockPassword" android:exported="false" <activity android:name="ChooseLockPassword"
android:exported="false"
android:theme="@style/SetupWizardTheme.Light"
android:windowSoftInputMode="stateVisible|adjustResize"/> android:windowSoftInputMode="stateVisible|adjustResize"/>
<activity android:name=".SetupEncryptionInterstitial" <activity android:name=".SetupEncryptionInterstitial"
android:label="@string/encryption_interstitial_header" android:label="@string/encryption_interstitial_header"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme"/> android:theme="@style/SetupWizardTheme.Light"/>
<activity android:name=".EncryptionInterstitial"/> <activity android:name=".EncryptionInterstitial"
android:theme="@style/SetupWizardTheme.Light" />
<!-- Runs in the phone process since it needs access to the Phone object --> <!-- Runs in the phone process since it needs access to the Phone object -->
<activity android:name=".Settings$StatusActivity" <activity android:name=".Settings$StatusActivity"

100
res/layout-land/choose_lock_password.xml
View File

@@ -1,100 +0,0 @@
<?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.
*/
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<!-- "Enter PIN(Password) to unlock" -->
<TextView android:id="@+id/headerText"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:layout_marginEnd="6dip"
android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:layout_gravity="center"
android:layout_weight="1"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:gravity="center"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"
/>
</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"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</ScrollView>

55
res/layout-land/choose_lock_pattern.xml
View File

@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2008 The Android Open Source Project <!--
Copyright (C) 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License")
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
@@ -14,27 +15,36 @@
limitations under the License. limitations under the License.
--> -->
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient <com.android.setupwizardlib.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android" 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/lock_settings_picker_title">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout" android:id="@+id/topLayout"
style="@style/SuwContentFrame"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<!-- left side: instructions and messages --> <!-- left side: instructions and messages -->
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="0dip" android:layout_width="0dip"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1.0" android:layout_weight="1.0"
> android:orientation="vertical">
<!-- header message --> <!-- header message -->
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:gravity="center" android:gravity="start|bottom"
android:textSize="18sp" /> android:textSize="18sp" />
<!-- footer can show a message, or confirm / restart buttons --> <!-- footer can show a message, or confirm / restart buttons -->
@@ -45,22 +55,28 @@
<!-- confirm / restart buttons --> <!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer" <LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal"> android:orientation="horizontal">
<!-- left / top button: skip, or re-try --> <!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton" <Button android:id="@+id/footerLeftButton"
style="@style/SecurityPreferenceButton" style="@style/SetupWizardButton.Negative"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/lockpattern_restart_button_text" /> android:text="@string/lockpattern_restart_button_text" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right / bottom button: confirm or ok --> <!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton" <Button android:id="@+id/footerRightButton"
style="@style/SecurityPreferenceButton" style="@style/SetupWizardButton.Positive"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/lockpattern_confirm_button_text" /> android:text="@string/lockpattern_confirm_button_text" />
@@ -73,22 +89,27 @@
android:layout_above="@+id/buttonContainer" android:layout_above="@+id/buttonContainer"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="4dip" android:layout_marginBottom="4dip"
android:textSize="14sp"/> android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<View
android:background="@*android:drawable/code_lock_left"
android:layout_width="2dip"
android:layout_height="match_parent" />
<!-- right side: lock pattern --> <!-- right side: lock pattern -->
<FrameLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.0">
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern" <com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/lock_pattern_background" /> android:background="@color/lock_pattern_background" />
</FrameLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient> </com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>

107
res/layout-land/setup_choose_lock_pattern.xml
View File

@@ -1,107 +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:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
settings:suwHeaderText="@string/lock_settings_picker_title">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"
style="@style/SuwContentFrame"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- left side: instructions and messages -->
<LinearLayout
android:layout_width="0dip"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:orientation="vertical">
<!-- header message -->
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start|bottom"
android:textSize="18sp" />
<!-- footer can show a message, or confirm / restart buttons -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0">
<!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SetupWizardButton.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_restart_button_text" />
<Space
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SetupWizardButton.Positive"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lockpattern_confirm_button_text" />
</LinearLayout>
<!-- message above buttons -->
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/buttonContainer"
android:layout_centerHorizontal="true"
android:layout_marginBottom="4dip"
android:textSize="14sp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
<!-- right side: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/lock_pattern_background" />
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</com.android.setupwizardlib.GlifLayout>

90
res/layout-sw600dp-land/choose_lock_password.xml
View File

@@ -1,90 +0,0 @@
<?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.
*/
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dip"
android:orientation="horizontal">
<!-- "Enter PIN(Password) to unlock" -->
<TextView android:id="@+id/headerText"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
android:layout_marginEnd="6dip"
android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:layout_gravity="center"
android:layout_weight="1"
android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"
/>
</LinearLayout>
<!-- confirm / restart buttons -->
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</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"
/>
</RelativeLayout>

88
res/layout-sw600dp-land/choose_lock_pattern.xml
View File

@@ -1,88 +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="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal">
<!-- header message -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="14dip">
<TextView android:id="@+id/headerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="0.6"/>
<!-- lock pattern widget -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="354dip"
android:layout_height="354dip"
android:background="@color/lock_pattern_background"
aspect="square"/>
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
<!-- footer message -->
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/headerText"
android:layout_marginTop="16dip"
android:layout_toEndOf="@id/lockPattern"
android:layout_marginStart="100dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone"/>
<!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_restart_button_text"/>
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_confirm_button_text"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

91
res/layout-sw600dp/choose_lock_password.xml
View File

@@ -1,91 +0,0 @@
<?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.
*/
-->
<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/textAppearanceLarge"/>
<!-- Password entry field -->
<EditText android:id="@+id/password_entry"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dip"
android:layout_marginStart="30dip"
android:layout_marginEnd="30dip"
android:layout_gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center"
android:textSize="32sp"
style="@style/TextAppearance.PasswordEntry"
/>
<!-- 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_alignParentBottom="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#00000000"
android:layout_marginBottom="30dip"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone"
/>
<View
android:layout_width="match_parent"
android:layout_height="0dip"
/>
<RelativeLayout
android:layout_height="wrap_content"
android:layout_width="match_parent">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentEnd="true"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

85
res/layout-sw600dp/choose_lock_pattern.xml
View File

@@ -1,85 +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="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal">
<!-- top: instructions and buttons -->
<!-- header message -->
<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginTop="96dip">
<TextView android:id="@+id/headerText"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"/>
</ScrollView>
<!-- footer message -->
<TextView android:id="@+id/footerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:visibility="gone"/>
<!-- bottom: lock pattern -->
<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
android:layout_width="354dip"
android:layout_height="354dip"
android:layout_marginTop="80dip"
android:background="@color/lock_pattern_background"
aspect="square"/>
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
<Button android:id="@+id/footerLeftButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_restart_button_text"/>
<!-- right / bottom button: confirm or ok -->
<Button android:id="@+id/footerRightButton"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpattern_confirm_button_text"/>
</LinearLayout>
</RelativeLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

110
res/layout/choose_lock_password.xml
View File

@@ -1,30 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
** Copyright (C) 2014 The Android Open Source Project
** Copyright 2008, The Android Open Source Project
** Licensed under the Apache License, Version 2.0 (the "License")
** Licensed under the Apache License, Version 2.0 (the "License") you may not use this file except in compliance with the License.
** you may not use this file except in compliance with the License. You may obtain a copy of the License at
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
** distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and
** See the License for the specific language governing permissions and limitations under the License.
** limitations under the License.
*/
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" <com.android.setupwizardlib.GlifLayout
android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:gravity="center_horizontal"> 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') --> <!-- header text ('Enter Pin') -->
<TextView android:id="@+id/headerText" <TextView android:id="@+id/headerText"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:lines="2" android:lines="2"
@@ -35,14 +43,40 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="30dip"
android:layout_marginEnd="30dip"
android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:inputType="textPassword"
android:imeOptions="actionNext|flagNoExtractUi"
android:textSize="24sp" android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry" 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 --> <!-- Spacer between password entry and keyboard -->
<View <View
@@ -50,30 +84,14 @@
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1"/> android:layout_weight="1"/>
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
<!-- Alphanumeric keyboard --> <!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="#00000000" android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="gone" android:visibility="gone"/>
/>
</LinearLayout> </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:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="56dp" android:minHeight="56dp"
android:paddingTop="16dp" android:paddingBottom="@dimen/suw_description_glif_margin_bottom_lists"
android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="16dp" android:paddingTop="@dimen/suw_description_glif_margin_top"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:lineSpacingExtra="@dimen/suw_description_line_spacing_extra"
android:textAppearance="?android:attr/textAppearanceListItem" />

92
res/layout/redaction_interstitial.xml
View File

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

2
res/values-sw600dp/aliases.xml
View File

@@ -19,7 +19,7 @@
<item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item> <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item> <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item> <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item> <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
<item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item> <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
</resources> </resources>

2
res/values/aliases.xml
View File

@@ -21,7 +21,7 @@
<item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item> <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item> <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item> <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="setup_choose_lock_pattern" type="layout">@layout/setup_choose_lock_pattern_common</item> <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
<item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item> <item name="setup_fingerprint_enroll_find_sensor" type="layout">@layout/setup_fingerprint_enroll_find_sensor_base</item>
</resources> </resources>

3
src/com/android/settings/ChooseLockGeneric.java
View File

@@ -32,7 +32,6 @@ import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.RemovalCallback; import android.hardware.fingerprint.FingerprintManager.RemovalCallback;
import android.os.Bundle; import android.os.Bundle;
import android.os.Process;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
@@ -42,9 +41,7 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
import android.view.View;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.Toast;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils;

10
src/com/android/settings/ChooseLockPassword.java
View File

@@ -25,7 +25,6 @@ import android.inputmethodservice.KeyboardView;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.UserHandle;
import android.text.Editable; import android.text.Editable;
import android.text.InputType; import android.text.InputType;
import android.text.Selection; import android.text.Selection;
@@ -40,6 +39,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener; import android.widget.TextView.OnEditorActionListener;
@@ -50,6 +50,7 @@ import com.android.internal.widget.PasswordEntryKeyboardHelper;
import com.android.internal.widget.PasswordEntryKeyboardView; import com.android.internal.widget.PasswordEntryKeyboardView;
import com.android.internal.widget.TextViewInputDisabler; import com.android.internal.widget.TextViewInputDisabler;
import com.android.settings.notification.RedactionInterstitial; import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
public class ChooseLockPassword extends SettingsActivity { public class ChooseLockPassword extends SettingsActivity {
public static final String PASSWORD_MIN_KEY = "lockscreen.password_min"; public static final String PASSWORD_MIN_KEY = "lockscreen.password_min";
@@ -143,6 +144,8 @@ public class ChooseLockPassword extends SettingsActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_choose_your_password_header); CharSequence msg = getText(R.string.lockpassword_choose_your_password_header);
setTitle(msg); setTitle(msg);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
} }
public static class ChooseLockPasswordFragment extends InstrumentedFragment public static class ChooseLockPasswordFragment extends InstrumentedFragment
@@ -287,7 +290,10 @@ public class ChooseLockPassword extends SettingsActivity {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
return inflater.inflate(R.layout.choose_lock_password, container, false); GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_password, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
} }
@Override @Override

10
src/com/android/settings/ChooseLockPattern.java
View File

@@ -21,12 +21,12 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
@@ -37,6 +37,7 @@ import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell; import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode; import com.android.internal.widget.LockPatternView.DisplayMode;
import com.android.settings.notification.RedactionInterstitial; import com.android.settings.notification.RedactionInterstitial;
import com.android.setupwizardlib.GlifLayout;
import com.google.android.collect.Lists; import com.google.android.collect.Lists;
import java.util.ArrayList; import java.util.ArrayList;
@@ -113,6 +114,8 @@ public class ChooseLockPattern extends SettingsActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header); CharSequence msg = getText(R.string.lockpassword_choose_your_pattern_header);
setTitle(msg); setTitle(msg);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
} }
@Override @Override
@@ -391,7 +394,10 @@ public class ChooseLockPattern extends SettingsActivity {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
return inflater.inflate(R.layout.choose_lock_pattern, container, false); final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
} }
@Override @Override

42
src/com/android/settings/EncryptionInterstitial.java
View File

@@ -23,19 +23,26 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityManager; import android.view.accessibility.AccessibilityManager;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
import java.util.List; import java.util.List;
public class EncryptionInterstitial extends SettingsActivity { public class EncryptionInterstitial extends SettingsActivity {
private final static String TAG = EncryptionInterstitial.class.getSimpleName(); private static final String TAG = EncryptionInterstitial.class.getSimpleName();
protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality"; protected static final String EXTRA_PASSWORD_QUALITY = "extra_password_quality";
protected static final String EXTRA_UNLOCK_METHOD_INTENT = "extra_unlock_method_intent"; protected static final String EXTRA_UNLOCK_METHOD_INTENT = "extra_unlock_method_intent";
@@ -63,6 +70,13 @@ public class EncryptionInterstitial extends SettingsActivity {
.putExtra(EXTRA_UNLOCK_METHOD_INTENT, unlockMethodIntent); .putExtra(EXTRA_UNLOCK_METHOD_INTENT, unlockMethodIntent);
} }
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
public static class EncryptionInterstitialFragment extends SettingsPreferenceFragment public static class EncryptionInterstitialFragment extends SettingsPreferenceFragment
implements DialogInterface.OnClickListener { implements DialogInterface.OnClickListener {
@@ -126,7 +140,8 @@ public class EncryptionInterstitial extends SettingsActivity {
disableId = R.string.encrypt_dont_require_password; disableId = R.string.encrypt_dont_require_password;
break; break;
} }
TextView message = createHeaderView(); TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
R.layout.encryption_interstitial_header, null, false);
message.setText(msgId); message.setText(msgId);
setHeaderView(message); setHeaderView(message);
@@ -138,10 +153,25 @@ public class EncryptionInterstitial extends SettingsActivity {
EXTRA_REQUIRE_PASSWORD, true)); EXTRA_REQUIRE_PASSWORD, true));
} }
protected TextView createHeaderView() { @Override
TextView message = (TextView) LayoutInflater.from(getActivity()).inflate( public void onViewCreated(View view, Bundle savedInstanceState) {
R.layout.encryption_interstitial_header, null, false); super.onViewCreated(view, savedInstanceState);
return message; GlifPreferenceLayout layout = (GlifPreferenceLayout) view;
layout.setDividerItemDecoration(new SettingsDividerItemDecoration(getContext()));
layout.setIcon(getContext().getDrawable(R.drawable.ic_lock));
layout.setHeaderText(getActivity().getTitle());
// Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in
// PreferenceFragment.
setDivider(null);
}
@Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) {
GlifPreferenceLayout layout = (GlifPreferenceLayout) parent;
return layout.onCreateRecyclerView(inflater, parent, savedInstanceState);
} }
protected void startLockIntent() { protected void startLockIntent() {

21
src/com/android/settings/SetupChooseLockPassword.java
View File

@@ -21,13 +21,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.android.setupwizardlib.GlifLayout;
/** /**
* Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
* from ChooseLockPassword class, and should remain similar to that behaviorally. This class should * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
@@ -90,22 +85,6 @@ public class SetupChooseLockPassword extends ChooseLockPassword {
public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment { public static class SetupChooseLockPasswordFragment extends ChooseLockPasswordFragment {
private GlifLayout mLayout;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
mLayout = (GlifLayout) inflater.inflate(
R.layout.setup_choose_lock_password, container, false);
return mLayout;
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mLayout.setHeaderText(getActivity().getTitle());
}
@Override @Override
protected Intent getRedactionInterstitialIntent(Context context) { protected Intent getRedactionInterstitialIntent(Context context) {
return null; return null;

23
src/com/android/settings/SetupChooseLockPattern.java
View File

@@ -20,14 +20,7 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import com.android.setupwizardlib.GlifLayout;
/** /**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
@@ -70,13 +63,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
return SetupChooseLockPatternFragment.class; return SetupChooseLockPatternFragment.class;
} }
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
@Override @Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
resid = SetupWizardUtils.getTheme(getIntent()); resid = SetupWizardUtils.getTheme(getIntent());
@@ -85,15 +71,6 @@ public class SetupChooseLockPattern extends ChooseLockPattern {
public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment { public static class SetupChooseLockPatternFragment extends ChooseLockPatternFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final GlifLayout layout = (GlifLayout) inflater.inflate(
R.layout.setup_choose_lock_pattern, container, false);
layout.setHeaderText(getActivity().getTitle());
return layout;
}
@Override @Override
protected Intent getRedactionInterstitialIntent(Context context) { protected Intent getRedactionInterstitialIntent(Context context) {
return null; return null;

8
src/com/android/settings/SetupEncryptionInterstitial.java
View File

@@ -25,7 +25,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout; import com.android.setupwizardlib.GlifPreferenceLayout;
@@ -94,13 +93,6 @@ public class SetupEncryptionInterstitial extends EncryptionInterstitial {
setDivider(null); setDivider(null);
} }
@Override
protected TextView createHeaderView() {
TextView message = (TextView) LayoutInflater.from(getActivity()).inflate(
R.layout.setup_encryption_interstitial_header, null, false);
return message;
}
@Override @Override
public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent,
Bundle savedInstanceState) { Bundle savedInstanceState) {

38
src/com/android/settings/SetupRedactionInterstitial.java
View File

@@ -19,11 +19,8 @@ package com.android.settings;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.LinearLayout;
import com.android.settings.notification.RedactionInterstitial; import com.android.settings.notification.RedactionInterstitial;
@@ -55,39 +52,8 @@ public class SetupRedactionInterstitial extends RedactionInterstitial {
super.onApplyThemeResource(theme, resid, first); super.onApplyThemeResource(theme, resid, first);
} }
@Override public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment {
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
public static class SetupRedactionInterstitialFragment extends RedactionInterstitialFragment // Setup wizard specific UI customizations can be done here
implements View.OnClickListener {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
return inflater.inflate(R.layout.setup_redaction_interstitial, container, false);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
final Button button = (Button) view.findViewById(R.id.redaction_next_button);
button.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v.getId() == R.id.redaction_next_button) {
final SetupRedactionInterstitial activity =
(SetupRedactionInterstitial) getActivity();
if (activity != null) {
activity.setResult(RESULT_OK, activity.getResultIntentData());
finish();
}
}
}
} }
} }

31
src/com/android/settings/notification/RedactionInterstitial.java
View File

@@ -25,8 +25,9 @@ import android.provider.Settings;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.Button;
import android.widget.CompoundButton; import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.RadioButton; import android.widget.RadioButton;
import android.widget.RadioGroup; import android.widget.RadioGroup;
import android.widget.TextView; import android.widget.TextView;
@@ -59,6 +60,13 @@ public class RedactionInterstitial extends SettingsActivity {
return RedactionInterstitialFragment.class.getName().equals(fragmentName); return RedactionInterstitialFragment.class.getName().equals(fragmentName);
} }
@Override
protected void onCreate(Bundle savedInstance) {
super.onCreate(savedInstance);
LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);
layout.setFitsSystemWindows(false);
}
/** /**
* Create an intent for launching RedactionInterstitial. * Create an intent for launching RedactionInterstitial.
* @return An intent to launch the activity is if is available, @null if the activity is not * @return An intent to launch the activity is if is available, @null if the activity is not
@@ -66,10 +74,6 @@ public class RedactionInterstitial extends SettingsActivity {
*/ */
public static Intent createStartIntent(Context ctx, int userId) { public static Intent createStartIntent(Context ctx, int userId) {
return new Intent(ctx, RedactionInterstitial.class) return new Intent(ctx, RedactionInterstitial.class)
.putExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, true)
.putExtra(EXTRA_PREFS_SET_BACK_TEXT, (String) null)
.putExtra(EXTRA_PREFS_SET_NEXT_TEXT, ctx.getString(
R.string.app_notifications_dialog_done))
.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, .putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID,
Utils.isManagedProfile(UserManager.get(ctx), userId) Utils.isManagedProfile(UserManager.get(ctx), userId)
? R.string.lock_screen_notifications_interstitial_title_profile ? R.string.lock_screen_notifications_interstitial_title_profile
@@ -78,7 +82,8 @@ public class RedactionInterstitial extends SettingsActivity {
} }
public static class RedactionInterstitialFragment extends SettingsPreferenceFragment public static class RedactionInterstitialFragment extends SettingsPreferenceFragment
implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener { implements RadioGroup.OnCheckedChangeListener, CompoundButton.OnCheckedChangeListener,
View.OnClickListener {
private RadioGroup mRadioGroup; private RadioGroup mRadioGroup;
private RestrictedRadioButton mShowAllButton; private RestrictedRadioButton mShowAllButton;
@@ -120,6 +125,20 @@ public class RedactionInterstitial extends SettingsActivity {
((RadioButton) view.findViewById(R.id.hide_all)) ((RadioButton) view.findViewById(R.id.hide_all))
.setText(R.string.lock_screen_notifications_summary_disable_profile); .setText(R.string.lock_screen_notifications_summary_disable_profile);
} }
final Button button = (Button) view.findViewById(R.id.redaction_done_button);
button.setOnClickListener(this);
}
@Override
public void onClick(View v) {
if (v.getId() == R.id.redaction_done_button) {
final RedactionInterstitial activity = (RedactionInterstitial) getActivity();
if (activity != null) {
activity.setResult(RESULT_OK, activity.getResultIntentData());
finish();
}
}
} }
@Override @Override