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

Merge "Fix the nullpointer bug in monkey test."

Browse Source
This commit is contained in:
Lei Yu
2016-08-15 19:58:57 +00:00
committed by Android (Google) Code Review
parent 95d55fc687 a2938d2a2f
commit b23a7c4c8e
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/support_offline_escalation_options.xml
View File

@@ -41,6 +41,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/support_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="8dp" android:paddingEnd="8dp"

8
src/com/android/settings/dashboard/SupportItemAdapter.java
View File

@@ -20,6 +20,7 @@ import android.annotation.DrawableRes;
import android.annotation.LayoutRes; import android.annotation.LayoutRes;
import android.annotation.StringRes; import android.annotation.StringRes;
import android.app.Activity; import android.app.Activity;
import android.app.ActivityManager;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
@@ -372,6 +373,13 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
} else { } else {
holder.text2View.setVisibility(View.GONE); holder.text2View.setVisibility(View.GONE);
} }
if (ActivityManager.isUserAMonkey()) {
holder.text1View.setVisibility(View.GONE);
holder.text2View.setVisibility(View.GONE);
spinner.setVisibility(View.GONE);
holder.itemView.findViewById(R.id.support_text).setVisibility(View.GONE);
}
} }
private void bindSignInPromoTile(ViewHolder holder, EscalationData data) { private void bindSignInPromoTile(ViewHolder holder, EscalationData data) {