aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 02:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sunny Goyal
2016-02-25 00:04:25 +00:00
committed by Android (Google) Code Review
parent 2cb92eb2bb 59871ef875
commit 81131edc8e
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/attrs.xml
View File

@@ -100,12 +100,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>
@@ -119,7 +115,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>

4
res/values/styles.xml
View File

@@ -84,13 +84,13 @@
<style name="DropTargetButton" parent="DropTargetButtonBase" />
<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>

2
src/com/android/launcher3/PreloadIconDrawable.java
View File

@@ -60,7 +60,7 @@ 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);