From 790934158d356bfce0db97ef5aebb12128bc86ea Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 23 May 2014 18:31:43 +0000 Subject: Revert "Use ViewCompat support library and delete ViewCompatUtils" This reverts commit db21267b788592ce99b9fb052801c6ec90bfe7b6. The reverting change breaks build in unbundled jb-ub-latinimegoole branch. Change-Id: Ia61424f5321eb97f981d22c4b08e9ea8d348f6c1 --- .../com/android/inputmethod/latin/setup/SetupWizardActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java') diff --git a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java index fcceaff0e..bcac05a6a 100644 --- a/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java +++ b/java/src/com/android/inputmethod/latin/setup/SetupWizardActivity.java @@ -25,7 +25,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.Message; import android.provider.Settings; -import android.support.v4.view.ViewCompat; import android.util.Log; import android.view.View; import android.view.inputmethod.InputMethodInfo; @@ -35,6 +34,7 @@ import android.widget.TextView; import android.widget.VideoView; import com.android.inputmethod.compat.TextViewCompatUtils; +import com.android.inputmethod.compat.ViewCompatUtils; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.settings.SettingsActivity; import com.android.inputmethod.latin.utils.LeakGuardHandlerWrapper; @@ -448,8 +448,8 @@ public final class SetupWizardActivity extends Activity implements View.OnClickL mActionLabel = (TextView)mStepView.findViewById(R.id.setup_step_action_label); mActionLabel.setText(res.getString(actionLabel)); if (actionIcon == 0) { - final int paddingEnd = ViewCompat.getPaddingEnd(mActionLabel); - ViewCompat.setPaddingRelative(mActionLabel, paddingEnd, 0, paddingEnd, 0); + final int paddingEnd = ViewCompatUtils.getPaddingEnd(mActionLabel); + ViewCompatUtils.setPaddingRelative(mActionLabel, paddingEnd, 0, paddingEnd, 0); } else { TextViewCompatUtils.setCompoundDrawablesRelativeWithIntrinsicBounds( mActionLabel, res.getDrawable(actionIcon), null, null, null); -- cgit v1.2.3-83-g751a