Merge "AOD: Disable not-yet-ready always-on feature" into oc-dev (2e3ef5bd) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListView.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.graphics.drawable.Drawable;
		import android.os.Bundle;
		import android.os.Trace;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.MathUtils;
		import android.util.SparseBooleanArray;
		import android.view.FocusFinder;
		@@ -147,6 +148,8 @@ import java.util.function.Predicate;
		*/
		@RemoteView
		public class ListView extends AbsListView {
		static final String TAG = "ListView";

		/**
		* Used to indicate a no preference for a position type.
		*/
		@@ -335,6 +338,12 @@ public class ListView extends AbsListView {
		* @param isSelectable whether the item is selectable
		*/
		public void addHeaderView(View v, Object data, boolean isSelectable) {
		if (v.getParent() != null && v.getParent() != this) {
		if (Log.isLoggable(TAG, Log.WARN)) {
		Log.w(TAG, "The specified child already has a parent. "
		+ "You must call removeView() on the child's parent first.");
		}
		}
		final FixedViewInfo info = new FixedViewInfo();
		info.view = v;
		info.data = data;
		@@ -429,6 +438,13 @@ public class ListView extends AbsListView {
		* @param isSelectable true if the footer view can be selected
		*/
		public void addFooterView(View v, Object data, boolean isSelectable) {
		if (v.getParent() != null && v.getParent() != this) {
		if (Log.isLoggable(TAG, Log.WARN)) {
		Log.w(TAG, "The specified child already has a parent. "
		+ "You must call removeView() on the child's parent first.");
		}
		}

		final FixedViewInfo info = new FixedViewInfo();
		info.view = v;
		info.data = data;

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,8 @@ public class AmbientDisplayConfiguration {
		}

		public boolean alwaysOnAvailable() {
		// TODO: introduce config_dozeAlwaysOnAvailable. For now just debuggable builds.
		return Build.IS_DEBUGGABLE && ambientDisplayAvailable();
		// Does not work properly yet.
		return false;
		}

		public String ambientDisplayComponent() {