Merge "Avoid some more layer creations" into lmp-dev (689d491d) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/layout/keyguard_pin_view.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@
	android:layout_weight="1"		android:layout_weight="1"
	android:layoutDirection="ltr"		android:layoutDirection="ltr"
	>		>
	<RelativeLayout		<com.android.keyguard.AlphaOptimizedRelativeLayout
	android:id="@+id/row0"		android:id="@+id/row0"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="0dp"		android:layout_height="0dp"
	@@ -79,7 +79,7 @@
	android:layout_alignParentBottom="true"		android:layout_alignParentBottom="true"
	android:background="#28FFFFFF"		android:background="#28FFFFFF"
	/>		/>
	</RelativeLayout>		</com.android.keyguard.AlphaOptimizedRelativeLayout>
	<LinearLayout		<LinearLayout
	android:id="@+id/row1"		android:id="@+id/row1"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	@@ -196,7 +196,7 @@
	androidprv:textView="@+id/pinEntry"		androidprv:textView="@+id/pinEntry"
	androidprv:digit="0"		androidprv:digit="0"
	/>		/>
	<ImageButton		<com.android.keyguard.AlphaOptimizedImageButton
	android:id="@+id/key_enter"		android:id="@+id/key_enter"
	android:layout_width="0px"		android:layout_width="0px"
	android:layout_height="match_parent"		android:layout_height="match_parent"

0 → 100644

+38 −0

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

			package com.android.keyguard;

			import android.content.Context;
			import android.util.AttributeSet;
			import android.widget.ImageButton;
			import android.widget.RelativeLayout;

			/**
			* A frame layout which does not have overlapping renderings commands and therefore does not need a
			* layer when alpha is changed.
			*/
			public class AlphaOptimizedImageButton extends ImageButton {

			public AlphaOptimizedImageButton(Context context, AttributeSet attrs) {
			super(context, attrs);
			}

			@Override
			public boolean hasOverlappingRendering() {
			return false;
			}
			}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* limitations under the License		* limitations under the License
	*/		*/

	package com.android.systemui.statusbar;		package com.android.keyguard;

	import android.content.Context;		import android.content.Context;
	import android.util.AttributeSet;		import android.util.AttributeSet;

0 → 100644

+37 −0

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

			package com.android.keyguard;

			import android.content.Context;
			import android.util.AttributeSet;
			import android.widget.RelativeLayout;

			/**
			* A frame layout which does not have overlapping renderings commands and therefore does not need a
			* layer when alpha is changed.
			*/
			public class AlphaOptimizedRelativeLayout extends RelativeLayout {

			public AlphaOptimizedRelativeLayout(Context context, AttributeSet attrs) {
			super(context, attrs);
			}

			@Override
			public boolean hasOverlappingRendering() {
			return false;
			}
			}

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -17,13 +17,11 @@
	package com.android.keyguard;		package com.android.keyguard;

	import android.content.Context;		import android.content.Context;
	import android.content.res.TypedArray;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	import android.view.View;		import android.view.View;
	import android.widget.LinearLayout;

	public class EmergencyCarrierArea extends LinearLayout {		public class EmergencyCarrierArea extends AlphaOptimizedLinearLayout {

	private CarrierText mCarrierText;		private CarrierText mCarrierText;
	private EmergencyButton mEmergencyButton;		private EmergencyButton mEmergencyButton;