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

Merge "Tweak layouts to make support UI look better." into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-13 18:51:54 +00:00
committed by Android (Google) Code Review
parent 8c50ced07c 55c6ea25f4
commit 8b47c12550
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/support_offline_escalation_options.xml
View File

@@ -64,6 +64,5 @@
style="@style/SupportSecondaryButton" style="@style/SupportSecondaryButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:minHeight="48dp"/> android:minHeight="48dp"/>
</LinearLayout> </LinearLayout>

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

@@ -290,11 +290,13 @@ public final class SupportItemAdapter extends RecyclerView.Adapter<SupportItemAd
} }
if (holder.summary1View != null) { if (holder.summary1View != null) {
holder.summary1View.setText(data.summary1); holder.summary1View.setText(data.summary1);
holder.summary1View.setVisibility(mHasInternet ? View.VISIBLE : View.GONE); holder.summary1View.setVisibility(mHasInternet && !TextUtils.isEmpty(data.summary1)
? View.VISIBLE : View.GONE);
} }
if (holder.summary2View != null) { if (holder.summary2View != null) {
holder.summary2View.setText(data.summary2); holder.summary2View.setText(data.summary2);
holder.summary2View.setVisibility(mHasInternet ? View.VISIBLE : View.GONE); holder.summary2View.setVisibility(mHasInternet && !TextUtils.isEmpty(data.summary2)
? View.VISIBLE : View.GONE);
} }
} }