Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev (223d45ea) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+15 −9

Original line number	Diff line number	Diff line
		@@ -1594,7 +1594,8 @@
		android:resource="@string/notification_suggestion_summary" />
		</activity>

		<activity android:name=".notification.RedactionInterstitial"/>
		<activity android:name=".notification.RedactionInterstitial"
		android:theme="@style/SetupWizardTheme.Light" />

		<activity android:name=".notification.RedactionSettingsStandalone"
		android:exported="true">
		@@ -1641,7 +1642,7 @@
		<activity android:name=".fingerprint.SetupFingerprintEnrollIntroduction"
		android:exported="true"
		android:permission="android.permission.MANAGE_FINGERPRINT"
		android:theme="@style/SetupWizardDisableAppStartingTheme">
		android:theme="@style/SetupWizardTheme.Light">
		<intent-filter>
		<action android:name="android.settings.FINGERPRINT_SETUP" />
		<category android:name="android.intent.category.DEFAULT" />
		@@ -1661,7 +1662,7 @@

		<activity android:name="SetupChooseLockGeneric"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/SetupWizardDisableAppStartingTheme"
		android:theme="@style/SetupWizardTheme.Light"
		android:label="@string/lock_settings_picker_title">
		<intent-filter android:priority="1">
		<action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
		@@ -1719,25 +1720,30 @@
		<activity android:name="SetupChooseLockPattern"
		android:exported="false"
		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"
		android:exported="false"
		android:taskAffinity="com.android.wizard"
		android:theme="@style/SetupWizardDisableAppStartingTheme"
		android:theme="@style/SetupWizardTheme.Light"
		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"/>

		<activity android:name=".SetupEncryptionInterstitial"
		android:label="@string/encryption_interstitial_header"
		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 -->
		<activity android:name=".Settings$StatusActivity"

res/layout-land/choose_lock_password.xml

deleted100644 → 0

+0 −100

Original line number	Diff line number	Diff line
		<?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>

res/layout-land/choose_lock_pattern.xml

+91 −70

Original line number	Diff line number	Diff line
		<?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 obtain a copy of the License at

		@@ -14,27 +15,36 @@
		limitations under the License.
		-->

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		<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:orientation="vertical"
		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="center"
		android:gravity="start\|bottom"
		android:textSize="18sp" />

		<!-- footer can show a message, or confirm / restart buttons -->
		@@ -45,22 +55,28 @@

		<!-- confirm / restart buttons -->
		<LinearLayout android:id="@+id/buttonContainer"
		style="@style/SecurityPreferenceButtonContainer"
		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/SecurityPreferenceButton"
		android:layout_width="match_parent"
		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/SecurityPreferenceButton"
		android:layout_width="match_parent"
		style="@style/SetupWizardButton.Positive"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:text="@string/lockpattern_confirm_button_text" />

		@@ -73,22 +89,27 @@
		android:layout_above="@+id/buttonContainer"
		android:layout_centerHorizontal="true"
		android:layout_marginBottom="4dip"
		android:textSize="14sp"/>
		android:textSize="14sp"
		android:visibility="gone" />

		</RelativeLayout>
		</LinearLayout>

		<View
		android:background="@*android:drawable/code_lock_left"
		android:layout_width="2dip"
		android:layout_height="match_parent" />
		</LinearLayout>

		<!-- 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"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout_gravity="center"
		android:background="@color/lock_pattern_background" />

		</FrameLayout>

		</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>

		</com.android.setupwizardlib.GlifLayout>

res/layout-land/setup_choose_lock_pattern.xml

deleted100644 → 0

+0 −107

Original line number	Diff line number	Diff line
		<?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>

res/layout-sw600dp-land/choose_lock_password.xml

deleted100644 → 0

+0 −90

Original line number	Diff line number	Diff line
		<?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>
		No newline at end of file