Merge "Update rating bar assets for Material" (9aac7f70) · Commits · e / os / android_frameworks_base

core/java/android/widget/ProgressBar.java

+61 −18

Original line number	Diff line number	Diff line
		@@ -60,7 +60,6 @@ import android.widget.RemoteViews.RemoteView;

		import java.util.ArrayList;


		/**
		* <p>
		* Visual indicator of progress in some operation. Displays a bar to the user
		@@ -266,9 +265,14 @@ public class ProgressBar extends View {

		final Drawable progressDrawable = a.getDrawable(R.styleable.ProgressBar_progressDrawable);
		if (progressDrawable != null) {
		// Calling this method can set mMaxHeight, make sure the corresponding
		// XML attribute for mMaxHeight is read after calling this method
		// Calling setProgressDrawable can set mMaxHeight, so make sure the
		// corresponding XML attribute for mMaxHeight is read after calling
		// this method.
		if (needsTileify(progressDrawable)) {
		setProgressDrawableTiled(progressDrawable);
		} else {
		setProgressDrawable(progressDrawable);
		}
		}


		@@ -292,13 +296,17 @@ public class ProgressBar extends View {

		setProgress(a.getInt(R.styleable.ProgressBar_progress, mProgress));

		setSecondaryProgress(
		a.getInt(R.styleable.ProgressBar_secondaryProgress, mSecondaryProgress));
		setSecondaryProgress(a.getInt(
		R.styleable.ProgressBar_secondaryProgress, mSecondaryProgress));

		final Drawable indeterminateDrawable = a.getDrawable(
		R.styleable.ProgressBar_indeterminateDrawable);
		if (indeterminateDrawable != null) {
		if (needsTileify(indeterminateDrawable)) {
		setIndeterminateDrawableTiled(indeterminateDrawable);
		} else {
		setIndeterminateDrawable(indeterminateDrawable);
		}
		}

		mOnlyIndeterminate = a.getBoolean(
		@@ -394,6 +402,45 @@ public class ProgressBar extends View {
		}
		}

		/**
		* Returns {@code true} if the target drawable needs to be tileified.
		*
		* @param dr the drawable to check
		* @return {@code true} if the target drawable needs to be tileified,
		* {@code false} otherwise
		*/
		private static boolean needsTileify(Drawable dr) {
		if (dr instanceof LayerDrawable) {
		final LayerDrawable orig = (LayerDrawable) dr;
		final int N = orig.getNumberOfLayers();
		for (int i = 0; i < N; i++) {
		if (needsTileify(orig.getDrawable(i))) {
		return true;
		}
		}
		return false;
		}

		if (dr instanceof StateListDrawable) {
		final StateListDrawable in = (StateListDrawable) dr;
		final int N = in.getStateCount();
		for (int i = 0; i < N; i++) {
		if (needsTileify(in.getStateDrawable(i))) {
		return true;
		}
		}
		return false;
		}

		// If there's a bitmap that's not wrapped with a ClipDrawable or
		// ScaleDrawable, we'll need to wrap it and apply tiling.
		if (dr instanceof BitmapDrawable) {
		return true;
		}

		return false;
		}

		/**
		* Converts a drawable to a tiled version of itself. It will recursively
		* traverse layer and state list drawables.
		@@ -448,18 +495,14 @@ public class ProgressBar extends View {
		mSampleTile = tileBitmap;
		}

		final ShapeDrawable shapeDrawable = new ShapeDrawable(getDrawableShape());
		final BitmapShader bitmapShader = new BitmapShader(tileBitmap,
		Shader.TileMode.REPEAT, Shader.TileMode.CLAMP);
		shapeDrawable.getPaint().setShader(bitmapShader);

		// Ensure the tint and filter are propagated in the correct order.
		shapeDrawable.setTintList(bitmap.getTint());
		shapeDrawable.setTintMode(bitmap.getTintMode());
		shapeDrawable.setColorFilter(bitmap.getColorFilter());
		final BitmapDrawable clone = (BitmapDrawable) bitmap.getConstantState().newDrawable();
		clone.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.CLAMP);

		return clip ? new ClipDrawable(
		shapeDrawable, Gravity.LEFT, ClipDrawable.HORIZONTAL) : shapeDrawable;
		if (clip) {
		return new ClipDrawable(clone, Gravity.LEFT, ClipDrawable.HORIZONTAL);
		} else {
		return clone;
		}
		}

		return drawable;

core/res/res/color/ratingbar_background_material.xml

0 → 100644

+25 −0

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

		<selector xmlns:android="http://schemas.android.com/apk/res/android">
		<item
		android:state_pressed="true"
		android:color="?attr/colorControlActivated"
		android:alpha="?attr/disabledAlpha" />
		<item
		android:color="?attr/colorControlNormal"
		android:alpha="?attr/disabledAlpha" />
		</selector>

core/res/res/drawable-hdpi/ic_star_black_16dp.png

0 → 100644

+263 B

Loading image diff...

core/res/res/drawable-hdpi/ic_star_black_36dp.png

0 → 100644

+541 B

Loading image diff...

core/res/res/drawable-hdpi/ic_star_black_48dp.png

0 → 100644

+668 B

Loading image diff...