PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Disabling som attributes so that dependencies can use compat libraries"" into ub-launcher3-burnaby-polish

Browse Source 
am: 81131edc8e

* commit '81131edc8ed9c1d866d98bef3f08bbd9eb4d47fc':
  Revert "Disabling som attributes so that dependencies can use compat libraries"
This commit is contained in:
Sunny Goyal
2016-02-25 00:13:15 +00:00
committed by android-build-merger
parent b20f3b2b82 81131edc8e
commit 86feafc1e5
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/values/attrs.xml
+1 -5
View File
@@ -60,12 +60,8 @@
<attr name="y" format="string" />
<attr name="spanX" format="string" />
<attr name="spanY" format="string" />
<!--
Temporarily disabling attr format definitions to prevent conflicts with support libs.
Re-enable it once AAPT starts supporting multiple definitions of same attr.
<attr name="icon" format="reference" />
<attr name="title" format="reference" />
-->
<attr name="uri" format="string" />
</declare-styleable>
@@ -79,7 +75,7 @@
</declare-styleable>
<declare-styleable name="PreloadIconDrawable">
<attr name="ringBackground" format="reference" />
<attr name="background" format="reference" />
<attr name="ringOutset" format="dimension" />
<attr name="indicatorSize" format="dimension" />
</declare-styleable>
res/values/styles.xml
+2 -2
View File
@@ -98,13 +98,13 @@
<!-- Virtual preloaders -->
<style name="PreloadIcon">
<item name="ringBackground">@drawable/virtual_preload</item>
<item name="background">@drawable/virtual_preload</item>
<item name="indicatorSize">4dp</item>
<item name="ringOutset">4dp</item>
</style>
<style name="PreloadIcon.Folder">
<item name="ringBackground">@drawable/virtual_preload_folder</item>
<item name="background">@drawable/virtual_preload_folder</item>
<item name="indicatorSize">4dp</item>
<item name="ringOutset">4dp</item>
</style>
src/com/android/launcher3/PreloadIconDrawable.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class PreloadIconDrawable extends Drawable {
public void applyPreloaderTheme(Theme t) {
TypedArray ta = t.obtainStyledAttributes(R.styleable.PreloadIconDrawable);
mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_ringBackground);
mBgDrawable = ta.getDrawable(R.styleable.PreloadIconDrawable_background);
mBgDrawable.setFilterBitmap(true);
mPaint.setStrokeWidth(ta.getDimension(R.styleable.PreloadIconDrawable_indicatorSize, 0));
mRingOutset = ta.getDimensionPixelSize(R.styleable.PreloadIconDrawable_ringOutset, 0);