Merge "Settings suggestions now describes expand and collapse in talkback" into nyc-mr1-dev (fb0d4c85) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -5870,6 +5870,12 @@
		<!--Dashboard strings-->
		<!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
		<string name="dashboard_title">Settings</string>
		<!-- Text to describe the items to be expanded as suggested settings [CHAR LIMIT=none] -->
		<plurals name="settings_suggestion_header_summary_hidden_items">
		<item quantity="one">Show %d hidden item</item>
		<item quantity="other">Show %d hidden items</item>
		</plurals>


		<!-- Search strings -->
		<!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->

+14 −3

Original line number	Diff line number	Diff line
		@@ -301,11 +301,22 @@ public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.Dash
		}

		private void onBindSuggestionHeader(final DashboardItemHolder holder) {
		holder.icon.setImageResource(hasMoreSuggestions() ? R.drawable.ic_expand_more
		: R.drawable.ic_expand_less);
		holder.title.setText(mContext.getString(R.string.suggestions_title, mSuggestions.size()));
		final boolean moreSuggestions = hasMoreSuggestions();
		final int undisplayedSuggestionCount =
		mSuggestions.size() - getDisplayableSuggestionCount();
		holder.icon.setImageResource(moreSuggestions ? R.drawable.ic_expand_more
		: R.drawable.ic_expand_less);
		holder.title.setText(mContext.getString(R.string.suggestions_title, mSuggestions.size()));
		String summaryContentDescription;
		if (moreSuggestions) {
		summaryContentDescription = mContext.getResources().getQuantityString(
		R.plurals.settings_suggestion_header_summary_hidden_items,
		undisplayedSuggestionCount, undisplayedSuggestionCount);
		} else {
		summaryContentDescription = mContext.getString(R.string.condition_expand_hide);
		}
		holder.summary.setContentDescription(summaryContentDescription);

		if (undisplayedSuggestionCount == 0) {
		holder.summary.setText(null);
		} else {