-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MaterialSwitch] Amendments to thumb icon size support
Resolves #3364 PiperOrigin-RevId: 549627031
- Loading branch information
1 parent
ed9b541
commit db9a641
Showing
11 changed files
with
160 additions
and
102 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
catalog/java/io/material/catalog/materialswitch/res/drawable/mtrl_ic_check.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <!-- | ||
| ~ Copyright (C) 2023 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. | ||
| --> | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:width="48dp" | ||
| android:height="48dp" | ||
| android:tint="?attr/colorControlNormal" | ||
| android:viewportHeight="960" | ||
| android:viewportWidth="960" | ||
| tools:ignore="NewApi"> | ||
| <path | ||
| android:fillColor="@android:color/white" | ||
| android:pathData="M378,714L154,490L197,447L378,628L762,244L805,287L378,714Z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
lib/java/com/google/android/material/drawable/ScaledDrawableWrapper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2023 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.google.android.material.drawable; | ||
|
|
||
| import android.graphics.drawable.Drawable; | ||
| import androidx.appcompat.graphics.drawable.DrawableWrapperCompat; | ||
| import androidx.annotation.NonNull; | ||
| import androidx.annotation.RestrictTo; | ||
| import androidx.annotation.RestrictTo.Scope; | ||
|
|
||
| /** | ||
| * An extension of {@link DrawableWrapperCompat} that will take a given Drawable and scale it by the | ||
| * specified width and height. | ||
| */ | ||
| @RestrictTo(Scope.LIBRARY_GROUP) | ||
| public class ScaledDrawableWrapper extends DrawableWrapperCompat { | ||
| private final int width; | ||
| private final int height; | ||
|
|
||
| public ScaledDrawableWrapper(@NonNull Drawable drawable, int width, int height) { | ||
| super(drawable); | ||
| this.width = width; | ||
| this.height = height; | ||
| } | ||
|
|
||
| @Override | ||
| public int getIntrinsicWidth() { | ||
| return width; | ||
| } | ||
|
|
||
| @Override | ||
| public int getIntrinsicHeight() { | ||
| return height; | ||
| } | ||
| } |
Oops, something went wrong.