Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd90acf2 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev

parents 45fd5c4d 409c4708

res/layout/support_offline_escalation_options.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        android:layout_height="wrap_content"

        android:orientation="horizontal">

        <TextView

            android:id="@+id/support_text"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingEnd="8dp"

src/com/android/settings/dashboard/SupportItemAdapter.java

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.annotation.DrawableRes; 
import android.annotation.LayoutRes;

import android.annotation.StringRes;

import android.app.Activity;

import android.app.ActivityManager;

import android.app.DialogFragment;

import android.content.Context;

import android.content.Intent;
@@ -372,6 +373,13 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd 
        } else {

            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) {