Merge "Show the bar chart detail after hiding it." (be84d93c) · Commits · e / os / android_frameworks_base

packages/SettingsLib/BarChartPreference/src/com/android/settingslib/widget/BarChartPreference.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ public class BarChartPreference extends Preference {
	if (mDetailsId == 0) {		if (mDetailsId == 0) {
	detailsView.setVisibility(View.GONE);		detailsView.setVisibility(View.GONE);
	} else {		} else {
			detailsView.setVisibility(View.VISIBLE);
	detailsView.setText(mDetailsId);		detailsView.setText(mDetailsId);
	detailsView.setOnClickListener(mDetailsOnClickListener);		detailsView.setOnClickListener(mDetailsOnClickListener);
	}		}

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -80,6 +80,20 @@ public class BarChartPreferenceTest {
	assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE);		assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE);
	}		}

			@Test
			public void onBindViewHolder_notSetDetailsRes_barChartDetailsViewIsGoneThenReappears() {
			// We don't call BarChartPreference#setBarChartDetails yet.
			mPreference.onBindViewHolder(mHolder);

			assertThat(mDetailsView.getVisibility()).isEqualTo(View.GONE);

			mPreference.setBarChartDetails(R.string.debug_app);
			mPreference.onBindViewHolder(mHolder);

			assertThat(mDetailsView.getVisibility()).isEqualTo(View.VISIBLE);
			assertThat(mDetailsView.getText()).isEqualTo(mContext.getText(R.string.debug_app));
			}

	@Test		@Test
	public void setBarChartDetailsRes_setDetailsRes_showInBarChartDetails() {		public void setBarChartDetailsRes_setDetailsRes_showInBarChartDetails() {
	mPreference.setBarChartDetails(R.string.debug_app);		mPreference.setBarChartDetails(R.string.debug_app);