release-request-a84b3435-75fa-41e8-bd3c-ca0f4cbd5cc5-for-git_oc-m2-release-435... (33951dbf) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+0 −14

Original line number	Diff line number	Diff line
		@@ -1163,20 +1163,6 @@
		android:value="true" />
		</activity>

		<activity android:name="Settings$RealRunningServicesActivity"
		android:label="@string/runningservices_settings_title"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter>
		<action android:name="android.intent.action.settings.RUNNING_SERVICES" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.applications.RunningServices" />
		<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
		android:value="true" />
		</activity>

		<!-- Provide direct entry into manage apps showing storage usage of apps. -->
		<activity android:name="Settings$StorageUseActivity"
		android:label="@string/storageuse_settings_title"

+5 −3

Original line number	Diff line number	Diff line
		@@ -138,10 +138,12 @@
		</LinearLayout>

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

		<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		@@ -149,7 +151,7 @@
		android:layout_gravity="center"
		android:background="@color/lock_pattern_background" />

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

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -96,10 +96,12 @@

		</ScrollView>

		<FrameLayout
		<com.android.setupwizardlib.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_weight="1">
		android:layout_weight="1"
		android:paddingStart="0dp">

		<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		@@ -107,7 +109,7 @@
		android:layout_gravity="center"
		android:background="@color/lock_pattern_background" />

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

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

+17 −5

Original line number	Diff line number	Diff line
		@@ -64,19 +64,31 @@
		android:gravity="center"
		android:clipChildren="false"
		android:clipToPadding="false"
		android:orientation="vertical">
		android:orientation="vertical"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">

		<TextView android:id="@+id/headerText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:minLines="2"
		android:gravity="center"
		android:paddingHorizontal="?attr/suwMarginSides"
		android:textSize="18sp" />

		<com.android.internal.widget.LockPatternView android:id="@+id/lockPattern"
		<com.android.setupwizardlib.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1" />
		android:layout_height="match_parent"
		android:layout_gravity="center" />

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

		</LinearLayout>

+17 −8

Original line number	Diff line number	Diff line
		@@ -61,14 +61,23 @@
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:orientation="vertical"
		android:gravity="center">
		android:gravity="center"
		android:paddingLeft="0dp"
		android:paddingRight="0dp">

		<com.android.setupwizardlib.view.FillContentLayout
		style="@style/LockPatternContainerStyle"
		android:layout_width="wrap_content"
		android:layout_height="0dp"
		android:layout_weight="1">

		<com.android.internal.widget.LockPatternView
		android:id="@+id/lockPattern"
		android:layout_width="match_parent"
		android:layout_height="0dp"
		android:layout_weight="4"
		android:layout_gravity="center_horizontal"/>
		android:layout_height="match_parent"
		android:layout_gravity="center" />

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

		<TextView
		style="@style/TextAppearance.ConfirmDeviceCredentialsErrorText"
		@@ -77,9 +86,8 @@
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:layout_marginHorizontal="?attr/suwMarginSides"
		android:layout_marginTop="12dp"
		android:layout_marginStart="12dp"
		android:layout_marginEnd="12dp"
		android:gravity="center_vertical"/>

		<ImageView
		@@ -87,6 +95,7 @@
		android:layout_gravity="center_horizontal"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginHorizontal="?attr/suwMarginSides"
		android:layout_marginBottom="24dp"
		android:contentDescription="@string/confirm_fingerprint_icon_content_description"
		android:visibility="gone"/>