diff --git a/samples/Support4Demos/AndroidManifest.xml b/samples/Support4Demos/AndroidManifest.xml index e662cf4b9..d3f0b8522 100644 --- a/samples/Support4Demos/AndroidManifest.xml +++ b/samples/Support4Demos/AndroidManifest.xml @@ -367,6 +367,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/Support4Demos/res/drawable-hdpi/ic_favorite.png b/samples/Support4Demos/res/drawable-hdpi/ic_favorite.png new file mode 100644 index 000000000..1de4e583d Binary files /dev/null and b/samples/Support4Demos/res/drawable-hdpi/ic_favorite.png differ diff --git a/samples/Support4Demos/res/drawable-mdpi/ic_favorite.png b/samples/Support4Demos/res/drawable-mdpi/ic_favorite.png new file mode 100644 index 000000000..aa5d340db Binary files /dev/null and b/samples/Support4Demos/res/drawable-mdpi/ic_favorite.png differ diff --git a/samples/Support4Demos/res/drawable-xhdpi/ic_favorite.png b/samples/Support4Demos/res/drawable-xhdpi/ic_favorite.png new file mode 100644 index 000000000..5868c34bf Binary files /dev/null and b/samples/Support4Demos/res/drawable-xhdpi/ic_favorite.png differ diff --git a/samples/Support4Demos/res/drawable-xxhdpi/ic_favorite.png b/samples/Support4Demos/res/drawable-xxhdpi/ic_favorite.png new file mode 100644 index 000000000..02b46e3bd Binary files /dev/null and b/samples/Support4Demos/res/drawable-xxhdpi/ic_favorite.png differ diff --git a/samples/Support4Demos/res/drawable-xxxhdpi/ic_favorite.png b/samples/Support4Demos/res/drawable-xxxhdpi/ic_favorite.png new file mode 100644 index 000000000..d7684c4cf Binary files /dev/null and b/samples/Support4Demos/res/drawable-xxxhdpi/ic_favorite.png differ diff --git a/samples/Support4Demos/res/layout/drawable_compat.xml b/samples/Support4Demos/res/layout/drawable_compat.xml new file mode 100644 index 000000000..dbf0413c9 --- /dev/null +++ b/samples/Support4Demos/res/layout/drawable_compat.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + diff --git a/samples/Support4Demos/res/values/strings.xml b/samples/Support4Demos/res/values/strings.xml index 0c388b2b8..2157be187 100644 --- a/samples/Support4Demos/res/values/strings.xml +++ b/samples/Support4Demos/res/values/strings.xml @@ -191,4 +191,8 @@ regular round + Not tint + Color tint + Color state list + diff --git a/samples/Support4Demos/src/com/example/android/supportv4/graphics/DrawableCompatActivity.java b/samples/Support4Demos/src/com/example/android/supportv4/graphics/DrawableCompatActivity.java new file mode 100644 index 000000000..f6790679b --- /dev/null +++ b/samples/Support4Demos/src/com/example/android/supportv4/graphics/DrawableCompatActivity.java @@ -0,0 +1,84 @@ +/* + * Copyright 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. + */ + +package com.example.android.supportv4.graphics; + +import com.example.android.supportv4.R; + +import android.app.Activity; +import android.graphics.Color; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.support.v4.content.ContextCompat; +import android.support.v4.graphics.drawable.DrawableCompat; +import android.widget.ImageView; +import android.widget.RadioGroup; + +/** + * Demonstrates use of a {@link DrawableCompat}'s ability to become circular. + */ +public class DrawableCompatActivity extends Activity { + + private static final int IMAGE_RES = R.drawable.ic_favorite; + + private ImageView mImageView; + private Drawable mDrawable; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.drawable_compat); + + mImageView = (ImageView) findViewById(R.id.image); + + Drawable d = ContextCompat.getDrawable(this, IMAGE_RES); + mDrawable = DrawableCompat.wrap(d.mutate()); + + mImageView.setImageDrawable(mDrawable); + + RadioGroup rg = (RadioGroup) findViewById(R.id.drawable_compat_options); + rg.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup radioGroup, int id) { + switch (id) { + case R.id.drawable_compat_no_tint: + clearTint(); + break; + case R.id.drawable_compat_color: + setColorTint(); + break; + case R.id.drawable_compat_state_list: + setColorStateListTint(); + break; + } + } + }); + } + + private void clearTint() { + DrawableCompat.setTintList(mDrawable, null); + } + + private void setColorTint() { + DrawableCompat.setTint(mDrawable, Color.MAGENTA); + } + + private void setColorStateListTint() { + DrawableCompat.setTintList(mDrawable, + ContextCompat.getColorStateList(this, R.color.tint_state_list)); + } + +}