am 14562754: (-s ours) am 81426b9b: Import translations. DO NOT MERGE
* commit '14562754ea68a333d81e189ca7aa31c95e4b5129':
Import translations. DO NOT MERGE
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7980260..1bd29e8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -30,7 +30,7 @@
<string name="widgets_tab_label" msgid="9145860100000983599">"ابزارکها"</string>
<string name="long_press_widget_to_add" msgid="7395697462851217506">"برای انتخاب یک ابزارک لمس کنید و نگه دارید."</string>
<string name="market" msgid="2652226429823445833">"فروشگاه"</string>
- <string name="widget_dims_format" msgid="1386418557719032947">"%2$d × %1$d"</string>
+ <string name="widget_dims_format" msgid="1386418557719032947">"%2$d \\u00d7 %1$d"</string>
<string name="external_drop_widget_error" msgid="2285187188524172774">"این مورد را نمیتوان در این صفحهٔ اصلی رها کرد."</string>
<string name="external_drop_widget_pick_title" msgid="7040647073452295370">"انتخاب ابزارک برای ایجاد"</string>
<string name="rename_folder_label" msgid="5646236631298452787">"نام پوشه"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8b99c4a..caa033b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -94,8 +94,8 @@
<string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"アプリの%1$d/%2$dページ"</string>
<string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"ウィジェットの%1$d/%2$dページ"</string>
<string name="workspace_cling_title" msgid="738396473989890567">"ここがあなたのホームです"</string>
- <string name="workspace_cling_move_item" msgid="791013895761065070">"お気に入りのアプリをここに置くことができます。"</string>
- <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"すべてのアプリを見るにはサークルをタップします。"</string>
+ <string name="workspace_cling_move_item" msgid="791013895761065070">"お気に入りのアプリをここに\\u200B置くことができます。"</string>
+ <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"すべてのアプリを見るには\\u200Bサークルをタップします。"</string>
<string name="all_apps_cling_title" msgid="2559734712581447107">"アプリの選択"</string>
<string name="all_apps_cling_add_item" msgid="5665035103260318891">"アプリをホーム画面に追加するにはアプリを押し続けます。"</string>
<string name="folder_cling_title" msgid="4308949882377840953">"フォルダでアプリを整理"</string>
diff --git a/src/com/android/launcher2/FirstFrameAnimatorHelper.java b/src/com/android/launcher2/FirstFrameAnimatorHelper.java
index 7180413..3815486 100644
--- a/src/com/android/launcher2/FirstFrameAnimatorHelper.java
+++ b/src/com/android/launcher2/FirstFrameAnimatorHelper.java
@@ -19,11 +19,10 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
-import android.animation.Animator.AnimatorListener;
import android.util.Log;
-import android.view.ViewTreeObserver;
import android.view.View;
import android.view.ViewPropertyAnimator;
+import android.view.ViewTreeObserver;
/*
* This is a helper class that listens to updates from the corresponding animation.
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index e8be3ef..c58189c 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -106,7 +106,6 @@
private static String sDefaultFolderName;
private static String sHintText;
- private ObjectAnimator mOpenCloseAnimator;
private boolean mDestroyed;
@@ -421,7 +420,7 @@
PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 1);
PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 1.0f);
PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 1.0f);
- final ObjectAnimator oa = mOpenCloseAnimator =
+ final ObjectAnimator oa =
LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, scaleX, scaleY);
oa.addListener(new AnimatorListenerAdapter() {
@@ -471,7 +470,7 @@
PropertyValuesHolder alpha = PropertyValuesHolder.ofFloat("alpha", 0);
PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat("scaleX", 0.9f);
PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat("scaleY", 0.9f);
- final ObjectAnimator oa = mOpenCloseAnimator =
+ final ObjectAnimator oa =
LauncherAnimUtils.ofPropertyValuesHolder(this, alpha, scaleX, scaleY);
oa.addListener(new AnimatorListenerAdapter() {
diff --git a/src/com/android/launcher2/LauncherViewPropertyAnimator.java b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
index 83b745e..258b2f4 100644
--- a/src/com/android/launcher2/LauncherViewPropertyAnimator.java
+++ b/src/com/android/launcher2/LauncherViewPropertyAnimator.java
@@ -19,9 +19,8 @@
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
import android.animation.TimeInterpolator;
-import android.animation.ValueAnimator;
-import android.view.ViewPropertyAnimator;
import android.view.View;
+import android.view.ViewPropertyAnimator;
import java.util.ArrayList;
import java.util.EnumSet;
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index 1336c7a..86ab128 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -128,7 +128,6 @@
mIsAppWidget = false;
mInfo = info;
CharSequence label = info.loadLabel(pm);
- final ImageView image = (ImageView) findViewById(R.id.widget_preview);
final TextView name = (TextView) findViewById(R.id.widget_name);
name.setText(label);
final TextView dims = (TextView) findViewById(R.id.widget_dims);
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d4488db..ca9d759 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -94,7 +94,6 @@
private Drawable mBackground;
boolean mDrawBackground = true;
private float mBackgroundAlpha = 0;
- private float mOverScrollMaxBackgroundAlpha = 0.0f;
private float mWallpaperScrollRatio = 1.0f;
private int mOriginalPageSpacing;
@@ -786,7 +785,6 @@
hideScrollingIndicator(false);
}
}
- mOverScrollMaxBackgroundAlpha = 0.0f;
if (mDelayedResizeRunnable != null) {
mDelayedResizeRunnable.run();