release-request-63504342-e033-4b9f-9c68-68bdd28fdc7c-for-git_oc-mr1-release-40... (f49bf49f) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@
		<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
		<uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
		<uses-permission android:name="android.permission.DELETE_PACKAGES"/>
		<uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>

		<application android:label="@string/settings_label"
		android:icon="@drawable/ic_launcher_settings"
		@@ -1498,6 +1499,7 @@
		android:theme="@android:style/Theme.NoDisplay">
		<intent-filter android:priority="1">
		<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
		<action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

res/layout-land/fingerprint_enroll_finish.xml

+32 −11

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		android:id="@+id/setup_wizard_layout"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:layout="@layout/suw_glif_blank_template"
		style="?attr/fingerprint_layout_theme">

		<LinearLayout
		@@ -28,18 +29,34 @@
		android:layout_height="match_parent"
		android:orientation="horizontal"
		android:clipToPadding="false"
		android:clipChildren="false"
		android:paddingBottom="0dp">
		android:clipChildren="false">

		<LinearLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:layout_height="match_parent"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">

		<ImageView
		android:id="@+id/suw_layout_icon"
		style="@style/SuwGlifIcon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="0dp"
		android:layout_marginRight="0dp"
		android:contentDescription="@null"
		android:src="@drawable/ic_fingerprint_header"/>

		<TextView
		android:id="@+id/suw_layout_title"
		style="@style/SuwGlifHeaderTitle"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginLeft="0dp"
		android:layout_marginRight="0dp"/>

		<TextView
		android:id="@+id/message"
		style="@style/SuwDescription.Glif"
		@@ -57,6 +74,11 @@
		android:textColor="?android:attr/textColorSecondary"
		android:visibility="gone" />

		<Space
		android:layout_width="0dp"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		@@ -89,21 +111,20 @@

		</LinearLayout>

		<FrameLayout
		<com.android.setupwizardlib.view.FillContentLayout
		android:layout_width="0dp"
		android:layout_weight="1"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical">
		android:layout_height="match_parent">

		<ImageView
		android:id="@+id/fingerprint_in_app_indicator"
		android:layout_width="@dimen/fingerprint_in_app_indicator_size"
		android:layout_height="@dimen/fingerprint_in_app_indicator_size"
		android:layout_gravity="center_horizontal"
		style="@style/SuwContentIllustration"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:contentDescription="@android:string/fingerprint_icon_content_description"
		android:src="@drawable/fp_app_indicator" />

		</FrameLayout>
		</com.android.setupwizardlib.view.FillContentLayout>

		</LinearLayout>

res/layout/choose_lock_password.xml

+1 −10

Original line number	Diff line number	Diff line
		@@ -32,20 +32,11 @@
		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:accessibilityLiveRegion="polite"
		android:gravity="center"
		android:lines="2"
		android:textAppearance="?android:attr/textAppearanceMedium"/>

		<LinearLayout
		android:id="@+id/password_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_marginTop="16dp"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical"

res/layout/fingerprint_enroll_finish_base.xml

+11 −20

Original line number	Diff line number	Diff line
		@@ -50,29 +50,20 @@
		android:textColor="?android:attr/textColorSecondary"
		android:visibility="gone" />

		<View
		android:layout_height="24dp"
		<com.android.setupwizardlib.view.FillContentLayout
		android:layout_width="match_parent"
		android:layout_weight="1"/>
		android:layout_height="0dp"
		android:layout_weight="1">

		<ImageView
		android:id="@+id/fingerprint_in_app_indicator"
		android:layout_height="0dp"
		android:layout_width="wrap_content"
		android:layout_weight="5"
		android:adjustViewBounds="true"
		android:minHeight="@dimen/fingerprint_in_app_indicator_min_size"
		android:minWidth="@dimen/fingerprint_in_app_indicator_min_size"
		android:maxHeight="@dimen/fingerprint_in_app_indicator_max_size"
		android:maxWidth="@dimen/fingerprint_in_app_indicator_max_size"
		android:layout_gravity="center_horizontal"
		style="@style/SuwContentIllustration"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:contentDescription="@android:string/fingerprint_icon_content_description"
		android:src="@drawable/fp_app_indicator" />

		<View
		android:layout_height="24dp"
		android:layout_width="match_parent"
		android:layout_weight="1"/>
		</com.android.setupwizardlib.view.FillContentLayout>

		</LinearLayout>

res/layout/preference_small_icon.xml

0 → 100644

+82 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2017 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.
		-->

		<!-- Same as preference_material except that it uses a 24dp fixed size icon -->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minHeight="?android:attr/listPreferredItemHeightSmall"
		android:gravity="center_vertical"
		android:paddingStart="?android:attr/listPreferredItemPaddingStart"
		android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
		android:background="?android:attr/selectableItemBackground"
		android:clipToPadding="false"
		android:focusable="true" >

		<LinearLayout
		android:id="@android:id/icon_frame"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:minWidth="56dp"
		android:gravity="start\|center_vertical"
		android:orientation="horizontal"
		android:paddingEnd="12dp"
		android:paddingTop="4dp"
		android:paddingBottom="4dp">
		<android.support.v7.internal.widget.PreferenceImageView
		android:id="@android:id/icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		app:maxWidth="24dp"
		app:maxHeight="24dp" />
		</LinearLayout>

		<RelativeLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:paddingTop="16dp"
		android:paddingBottom="16dp">

		<TextView android:id="@android:id/title"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceListItem"
		android:ellipsize="marquee" />

		<TextView android:id="@android:id/summary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@android:id/title"
		android:layout_alignStart="@android:id/title"
		android:textAppearance="?android:attr/textAppearanceListItemSecondary"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="10" />

		</RelativeLayout>

		<!-- Preference should place its actual preference widget here. -->
		<LinearLayout android:id="@android:id/widget_frame"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:gravity="end\|center_vertical"
		android:paddingStart="16dp"
		android:orientation="vertical" />

		</LinearLayout>
		No newline at end of file