Merge "Tweak the layout for Pattern/PIN/Password enrollment" into sc-dev (4a67b1c0) · Commits · e / os / android_packages_apps_Settings

res/drawable/ic_suggested_notifications.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@
		android:viewportWidth="24.0"
		android:viewportHeight="24.0">
		<path
		android:fillColor="@color/sud_color_accent_light"
		android:fillColor="?android:attr/colorPrimary"
		android:pathData="M18,17v-6c0,-3.07 -1.63,-5.64 -4.5,-6.32V4c0,-0.83 -0.67,-1.5 -1.5,-1.5S10.5,3.17 10.5,4v0.68C7.64,5.36 6,7.92 6,11v6H4v2h10h0.38H20v-2H18zM16,17H8v-6c0,-2.48 1.51,-4.5 4,-4.5s4,2.02 4,4.5V17z"/>
		<path
		android:fillColor="@color/sud_color_accent_light"
		android:fillColor="?android:attr/colorPrimary"
		android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4C10,21.1 10.9,22 12,22z"/>
		</vector>

res/layout-land/choose_lock_pattern.xml

deleted100644 → 0

+0 −133

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.google.android.setupdesign.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"
		android:layout="@layout/sud_glif_blank_template"
		settings:sucHeaderText="@string/lock_settings_picker_title">

		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		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:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<ScrollView
		android:id="@+id/scroll_layout_title_header"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<ImageView
		android:id="@+id/sud_layout_icon"
		style="@style/SudGlifIcon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="?attr/sudGlifHeaderGravity"
		android:layout_marginStart="0dp"
		android:layout_marginEnd="0dp"
		android:src="@drawable/ic_lock"/>

		<TextView
		android:id="@+id/suc_layout_title"
		style="@style/SudGlifHeaderTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="0dp"
		android:layout_marginEnd="0dp"/>

		<TextView
		android:id="@+id/sud_layout_description"
		style="@style/SudDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minLines="2" />

		<!-- header message -->
		<TextView
		android:id="@+id/headerText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="10dp"
		android:gravity="?attr/sudGlifHeaderGravity"
		android:textSize="18sp"/>

		<TextView android:id="@+id/footerText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_centerHorizontal="true"
		android:layout_marginTop="10dp"
		android:textSize="14sp"
		android:visibility="gone" />

		<Button
		android:id="@+id/screen_lock_options"
		style="@style/SudGlifButton.Tertiary"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="5dp"
		android:gravity="?attr/sudGlifHeaderGravity"
		android:text="@string/setup_lock_settings_options_button_label"
		android:visibility="gone" />

		</LinearLayout>

		</ScrollView>

		</LinearLayout>

		<!-- right side: lock pattern -->
		<com.google.android.setupdesign.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1.0"
		android:paddingStart="0dp">

		<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" />

		</com.google.android.setupdesign.view.FillContentLayout>

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

		</com.google.android.setupdesign.GlifLayout>

res/layout/choose_lock_pattern_common.xml

+30 −73

Original line number	Diff line number	Diff line
		@@ -18,49 +18,17 @@
		<!-- Used in phone portrait and tablet, as referenced in alias.xml. -->
		<com.google.android.setupdesign.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"
		android:layout="@layout/sud_glif_blank_template">
		android:icon="@drawable/ic_lock">

		<!-- takes up all space above button bar at bottom -->
		<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
		android:id="@+id/topLayout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<LinearLayout
		style="@style/SudGlifHeaderContainer"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical">

		<ImageView
		android:id="@+id/sud_layout_icon"
		style="@style/SudGlifIcon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_lock" />

		<TextView
		android:id="@+id/suc_layout_title"
		style="@style/SudGlifHeaderTitle"
		android:accessibilityLiveRegion="polite"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />

		</LinearLayout>

		<!-- takes up all space above button bar at bottom -->
		<LinearLayout
		style="@style/SudContentFrame"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:gravity="center"
		android:clipChildren="false"
		android:clipToPadding="false"
		@@ -69,22 +37,14 @@
		android:paddingRight="0dp">

		<TextView
		android:id="@+id/sud_layout_description"
		android:id="@+id/headerText"
		style="@style/SudDescription.Glif"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginStart="?attr/sudMarginStart"
		android:layout_marginEnd="?attr/sudMarginEnd"
		android:minLines="2" />

		<TextView android:id="@+id/headerText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minLines="2"
		android:gravity="center"
		android:paddingStart="?attr/sudMarginStart"
		android:paddingEnd="?attr/sudMarginEnd"
		android:textSize="12sp" />
		android:paddingEnd="?attr/sudMarginEnd"/>

		<com.google.android.setupdesign.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		@@ -100,8 +60,6 @@

		</com.google.android.setupdesign.view.FillContentLayout>

		</LinearLayout>

		<TextView android:id="@+id/footerText"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -117,7 +75,6 @@
		android:layout_height="wrap_content"
		android:text="@string/setup_lock_settings_options_button_label"
		android:visibility="gone"/>

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

		</com.google.android.setupdesign.GlifLayout>

src/com/android/settings/notification/RedactionInterstitial.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.os.UserManager;
		import android.provider.Settings;
		@@ -50,6 +49,7 @@ import com.google.android.setupcompat.template.FooterBarMixin;
		import com.google.android.setupcompat.template.FooterButton;
		import com.google.android.setupcompat.util.WizardManagerHelper;
		import com.google.android.setupdesign.GlifLayout;
		import com.google.android.setupdesign.util.ThemeHelper;

		public class RedactionInterstitial extends SettingsActivity {

		@@ -60,12 +60,6 @@ public class RedactionInterstitial extends SettingsActivity {
		return modIntent;
		}

		@Override
		protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
		final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
		super.onApplyThemeResource(theme, new_resid, first);
		}

		@Override
		protected boolean isValidFragment(String fragmentName) {
		return RedactionInterstitialFragment.class.getName().equals(fragmentName);
		@@ -73,6 +67,8 @@ public class RedactionInterstitial extends SettingsActivity {

		@Override
		protected void onCreate(Bundle savedInstance) {
		setTheme(SetupWizardUtils.getTheme(this, getIntent()));
		ThemeHelper.trySetDynamicColor(this);
		super.onCreate(savedInstance);
		findViewById(R.id.content_parent).setFitsSystemWindows(false);
		}

src/com/android/settings/password/ChooseLockPassword.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ import android.app.admin.PasswordMetrics;
		import android.app.settings.SettingsEnums;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.Resources.Theme;
		import android.graphics.Insets;
		import android.graphics.Typeface;
		import android.os.Bundle;
		@@ -89,6 +88,7 @@ import com.android.settings.notification.RedactionInterstitial;
		import com.google.android.setupcompat.template.FooterBarMixin;
		import com.google.android.setupcompat.template.FooterButton;
		import com.google.android.setupdesign.GlifLayout;
		import com.google.android.setupdesign.util.ThemeHelper;

		import java.util.ArrayList;
		import java.util.Collections;
		@@ -107,12 +107,6 @@ public class ChooseLockPassword extends SettingsActivity {
		return modIntent;
		}

		@Override
		protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
		final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
		super.onApplyThemeResource(theme, new_resid, first);
		}

		public static class IntentBuilder {

		private final Intent mIntent;
		@@ -207,6 +201,8 @@ public class ChooseLockPassword extends SettingsActivity {

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		setTheme(SetupWizardUtils.getTheme(this, getIntent()));
		ThemeHelper.trySetDynamicColor(this);
		super.onCreate(savedInstanceState);
		findViewById(R.id.content_parent).setFitsSystemWindows(false);
		}