Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev (d3cccec0) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/qs_detail_header.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,7 +14,8 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		<com.android.keyguard.AlphaOptimizedLinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		@@ -36,4 +37,4 @@
		android:clickable="false"
		android:textAppearance="@style/TextAppearance.QS.DetailHeader" />

		</LinearLayout>
		No newline at end of file
		</com.android.keyguard.AlphaOptimizedLinearLayout>
		No newline at end of file

+1 −1

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@
		android:layout_alignParentBottom="true"
		/>

		<ImageView
		<com.android.systemui.statusbar.AlphaOptimizedImageView
		android:id="@+id/qs_detail_header_progress"
		android:src="@drawable/indeterminate_anim"
		android:alpha="0"

0 → 100644

+51 −0

Original line number	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.systemui.statusbar;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.ImageView;

		/**
		* An ImageView which does not have overlapping rendering commands and therefore does not need a
		* layer when alpha is changed.
		*/
		public class AlphaOptimizedImageView extends ImageView
		{
		public AlphaOptimizedImageView(Context context) {
		super(context);
		}

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

		public AlphaOptimizedImageView(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		public AlphaOptimizedImageView(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -777,9 +777,11 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
		v.bringToFront();
		v.setVisibility(VISIBLE);
		}
		if (v.hasOverlappingRendering()) {
		v.animate().withLayer();
		}
		v.animate()
		.alpha(in ? 1 : 0)
		.withLayer()
		.withEndAction(new Runnable() {
		@Override
		public void run() {