Skip to content

Commit 392a3e1

Browse files
committed
Merge branch 'release/1.9.1'
2 parents 33e6e7a + 908f4f6 commit 392a3e1

File tree

87 files changed

+1651
-404
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1651
-404
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
*.iml
22
.gradle
3-
/.idea
43
.DS_Store
54
/build
65
/captures

.idea/.gitignore

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/.name

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ dependencies {
9696
implementation(deps.androidx.constraintlayout)
9797
implementation(deps.androidx.browser)
9898
implementation(deps.google.material)
99+
implementation(deps.io.coil)
99100
implementation(deps.free.reflection)
100101
debugImplementation(deps.leakcanary)
101102
implementation(project(":basic"))

app/src/main/assets/icons.otf

1020 Bytes
Binary file not shown.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package androidx.appcompat.widget;
2+
3+
import android.content.res.Resources;
4+
5+
import androidx.annotation.NonNull;
6+
7+
/**
8+
* Override {@link android.R.string.config_icon_mask}
9+
*/
10+
public class ResourcesOverride extends ResourcesWrapper {
11+
12+
private final int mOverrideId;
13+
private final String mOverrideValue;
14+
15+
public ResourcesOverride(Resources resources, int overrideId, String overrideValue) {
16+
super(resources);
17+
mOverrideId = overrideId;
18+
mOverrideValue = overrideValue;
19+
}
20+
21+
@NonNull
22+
@Override
23+
public String getString(int id) throws NotFoundException {
24+
if (id == mOverrideId) {
25+
return mOverrideValue;
26+
}
27+
return super.getString(id);
28+
}
29+
}

0 commit comments

Comments
 (0)