Merge changes from topic "am-b2190f70-93ef-44e6-8473-41d098cf486b" into ub-launcher3-master
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619 skipped: 18b5715113
[automerger skipped] Import translations. DO NOT MERGE skipped: d7a20ce619
Import translations. DO NOT MERGE
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5a8c6ca..2677b21 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -41,7 +41,7 @@
<string name="all_apps_search_market_message" msgid="1366263386197059176">"搜尋更多應用程式"</string>
<string name="notifications_header" msgid="1404149926117359025">"通知"</string>
<string name="long_press_shortcut_to_add" msgid="4524750017792716791">"按住捷徑即可選取。"</string>
- <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"撳兩下之後撳住，就可以揀選捷徑或者用自訂嘅操作。"</string>
+ <string name="long_accessible_way_to_add_shortcut" msgid="3327314059613154633">"連㩒兩下之後繼續㩒住，就可以揀選捷徑或者用自訂嘅操作。"</string>
<string name="out_of_space" msgid="4691004494942118364">"主畫面已無空間。"</string>
<string name="hotseat_out_of_space" msgid="7448809638125333693">"我的收藏寄存區沒有足夠空間"</string>
<string name="all_apps_button_label" msgid="8130441508702294465">"應用程式清單"</string>
diff --git a/src/com/android/launcher3/graphics/LauncherIcons.java b/src/com/android/launcher3/graphics/LauncherIcons.java
index ece6c58..333fe59 100644
--- a/src/com/android/launcher3/graphics/LauncherIcons.java
+++ b/src/com/android/launcher3/graphics/LauncherIcons.java
@@ -337,16 +337,15 @@
final int top = (textureHeight-height) / 2;
mOldBounds.set(icon.getBounds());
- int offset = 0;
if (Utilities.ATLEAST_OREO && icon instanceof AdaptiveIconDrawable) {
- offset = Math.max((int) Math.ceil(BLUR_FACTOR * textureWidth), Math.max(left, top));
+ int offset = Math.max((int) Math.ceil(BLUR_FACTOR * textureWidth), Math.max(left, top));
int size = Math.max(width, height);
- icon.setBounds(offset, offset, offset + size, offset + size);
+ icon.setBounds(offset, offset, size - offset, size - offset);
} else {
icon.setBounds(left, top, left+width, top+height);
}
mCanvas.save();
- mCanvas.scale(scale, scale, textureWidth / 2 + offset, textureHeight / 2 + offset);
+ mCanvas.scale(scale, scale, textureWidth / 2, textureHeight / 2);
icon.draw(mCanvas);
mCanvas.restore();
icon.setBounds(mOldBounds);